Merge branch 'release/3.26.2-1'3.26.2-1

663 files changed, 41114 insertions, 128428 deletions

diff --git a/ABOUT-NLS b/ABOUT-NLS
deleted file mode 100644
index 1551426..0000000
--- a/ABOUT-NLS
+++ /dev/null
@@ -1,1379 +0,0 @@
-1 Notes on the Free Translation Project
-***************************************
-
-Free software is going international!  The Free Translation Project is a
-way to get maintainers of free software, translators, and users all
-together, so that free software will gradually become able to speak many
-languages.  A few packages already provide translations for their
-messages.
-
-   If you found this 'ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU 'gettext' internally,
-itself available at your nearest GNU archive site.  But you do _not_
-need to install GNU 'gettext' prior to configuring, installing or using
-this package with messages translated.
-
-   Installers will find here some useful hints.  These notes also
-explain how users should proceed for getting the programs to use the
-available translations.  They tell how people wanting to contribute and
-work on translations can contact the appropriate team.
-
-1.1 INSTALL Matters
-===================
-
-Some packages are "localizable" when properly installed; the programs
-they contain can be made to speak your own native language.  Most such
-packages use GNU 'gettext'.  Other packages have their own ways to
-internationalization, predating GNU 'gettext'.
-
-   By default, this package will be installed to allow translation of
-messages.  It will automatically detect whether the system already
-provides the GNU 'gettext' functions.  Installers may use special
-options at configuration time for changing the default behaviour.  The
-command:
-
-     ./configure --disable-nls
-
-will _totally_ disable translation of messages.
-
-   When you already have GNU 'gettext' installed on your system and run
-configure without an option for your new package, 'configure' will
-probably detect the previously built and installed 'libintl' library and
-will decide to use it.  If not, you may have to to use the
-'--with-libintl-prefix' option to tell 'configure' where to look for it.
-
-   Internationalized packages usually have many 'po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at 'configure' time by using the
-'--disable-nls' switch, all available translations are installed
-together with the package.  However, the environment variable 'LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-'LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-1.2 Using This Package
-======================
-
-As a user, if your language has been installed for this package, you
-only have to set the 'LANG' environment variable to the appropriate
-'LL_CC' combination.  If you happen to have the 'LC_ALL' or some other
-'LC_xxx' environment variables set, you should unset them before setting
-'LANG', otherwise the setting of 'LANG' will not have the desired
-effect.  Here 'LL' is an ISO 639 two-letter language code, and 'CC' is
-an ISO 3166 two-letter country code.  For example, let's suppose that
-you speak German and live in Germany.  At the shell prompt, merely
-execute 'setenv LANG de_DE' (in 'csh'), 'export LANG; LANG=de_DE' (in
-'sh') or 'export LANG=de_DE' (in 'bash').  This can be done from your
-'.login' or '.profile' file, once and for all.
-
-   You might think that the country code specification is redundant.
-But in fact, some languages have dialects in different countries.  For
-example, 'de_AT' is used for Austria, and 'pt_BR' for Brazil.  The
-country code serves to distinguish the dialects.
-
-   The locale naming convention of 'LL_CC', with 'LL' denoting the
-language and 'CC' denoting the country, is the one use on systems based
-on GNU libc.  On other systems, some variations of this scheme are used,
-such as 'LL' or 'LL_CC.ENCODING'.  You can get the list of locales
-supported by your system for your language by running the command
-'locale -a | grep '^LL''.
-
-   Not all programs have translations for all languages.  By default, an
-English message is shown in place of a nonexistent translation.  If you
-understand other languages, you can set up a priority list of languages.
-This is done through a different environment variable, called
-'LANGUAGE'.  GNU 'gettext' gives preference to 'LANGUAGE' over 'LANG'
-for the purpose of message handling, but you still need to have 'LANG'
-set to the primary language; this is required by other parts of the
-system libraries.  For example, some Swedish users who would rather read
-translations in German than English for when Swedish is not available,
-set 'LANGUAGE' to 'sv:de' while leaving 'LANG' to 'sv_SE'.
-
-   Special advice for Norwegian users: The language code for Norwegian
-bokma*l changed from 'no' to 'nb' recently (in 2003).  During the
-transition period, while some message catalogs for this language are
-installed under 'nb' and some older ones under 'no', it's recommended
-for Norwegian users to set 'LANGUAGE' to 'nb:no' so that both newer and
-older translations are used.
-
-   In the 'LANGUAGE' environment variable, but not in the 'LANG'
-environment variable, 'LL_CC' combinations can be abbreviated as 'LL' to
-denote the language's main dialect.  For example, 'de' is equivalent to
-'de_DE' (German as spoken in Germany), and 'pt' to 'pt_PT' (Portuguese
-as spoken in Portugal) in this context.
-
-1.3 Translating Teams
-=====================
-
-For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list.  The up-to-date list of
-teams can be found at the Free Translation Project's homepage,
-'http://translationproject.org/', in the "Teams" area.
-
-   If you'd like to volunteer to _work_ at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is _not_ the same as the list itself, it has
-'-request' appended.  For example, speakers of Swedish can send a
-message to 'sv-request@li.org', having this message body:
-
-     subscribe
-
-   Keep in mind that team members are expected to participate _actively_
-in translations, or at solving translational difficulties, rather than
-merely lurking around.  If your team does not exist yet and you want to
-start one, or if you are unsure about what to do or how to get started,
-please write to 'coordinator@translationproject.org' to reach the
-coordinator for all translator teams.
-
-   The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skills are praised more than
-programming skills, here.
-
-1.4 Available Packages
-======================
-
-Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of Jun 2014.
-The matrix shows, in regard of each package, for which languages PO
-files have been submitted to translation coordination, with a
-translation percentage of at least 50%.
-
-     Ready PO files       af am an ar as ast az be bg bn bn_IN bs ca crh cs
-                        +---------------------------------------------------+
-     a2ps               |                       []                []     [] |
-     aegis              |                                                   |
-     anubis             |                                                   |
-     aspell             |                []                       []     [] |
-     bash               |                          []             []     [] |
-     bfd                |                                                   |
-     binutils           |                                         []        |
-     bison              |                                                   |
-     bison-runtime      |                []                                 |
-     buzztrax           |                                                [] |
-     ccd2cue            |                                                   |
-     ccide              |                                                   |
-     cflow              |                                                   |
-     clisp              |                                                   |
-     coreutils          |                                         []     [] |
-     cpio               |                                                   |
-     cppi               |                                                   |
-     cpplib             |                                         []        |
-     cryptsetup         |                                                [] |
-     datamash           |                                                   |
-     denemo             |                                         []     [] |
-     dfarc              |                                         []        |
-     dialog             |       []                                []     [] |
-     dico               |                                                   |
-     diffutils          |                                                [] |
-     dink               |                                         []        |
-     direvent           |                                                   |
-     doodle             |                                                [] |
-     dos2unix           |                                                   |
-     dos2unix-man       |                                                   |
-     e2fsprogs          |                                         []     [] |
-     enscript           |                                         []        |
-     exif               |                                                [] |
-     fetchmail          |                                         []     [] |
-     findutils          |                                                [] |
-     flex               |                                         []        |
-     freedink           |                                         []     [] |
-     fusionforge        |                                                   |
-     gas                |                                                   |
-     gawk               |                                         []        |
-     gcal               |                                         []        |
-     gcc                |                                                   |
-     gdbm               |                                                   |
-     gettext-examples   | []             []        []             []     [] |
-     gettext-runtime    |                          []             []     [] |
-     gettext-tools      |                          []             []        |
-     gjay               |                                                   |
-     glunarclock        |                []        []                    [] |
-     gnubiff            |                                                [] |
-     gnubik             |          []                                       |
-     gnucash            |          ()              ()             []        |
-     gnuchess           |                                                   |
-     gnulib             |                                                [] |
-     gnunet             |                                                   |
-     gnunet-gtk         |                                                   |
-     gold               |                                                   |
-     gphoto2            |                                                [] |
-     gprof              |                          []                       |
-     gramadoir          |                                                   |
-     grep               |                          []             []     [] |
-     grub               |                                         []        |
-     gsasl              |                                                   |
-     gss                |                                                   |
-     gst-plugins-bad    |                                                [] |
-     gst-plugins-base   |                          []             []     [] |
-     gst-plugins-good   |                          []             []     [] |
-     gst-plugins-ugly   |                          []             []     [] |
-     gstreamer          |                []        []             []     [] |
-     gtick              |                                                [] |
-     gtkam              |                       []                       [] |
-     gtkspell           | []             []     []                []     [] |
-     guix               |                                                   |
-     guix-packages      |                                                   |
-     gutenprint         |                                         []        |
-     hello              |                                         []        |
-     help2man           |                                                   |
-     help2man-texi      |                                                   |
-     hylafax            |                                                   |
-     idutils            |                                                   |
-     iso_15924          |                                                [] |
-     iso_3166           | []          []        [] [] []  []   [] [] []  [] |
-     iso_3166_2         |                                                   |
-     iso_4217           |                                                [] |
-     iso_639            |             [] []     [] [] []  []      [] []  [] |
-     iso_639_3          |                []                          []     |
-     iso_639_5          |                                                   |
-     jwhois             |                                                   |
-     kbd                |                                                [] |
-     klavaro            |          []              [] []          []     [] |
-     latrine            |                                                   |
-     ld                 |                          []                       |
-     leafpad            |                       [] []             []     [] |
-     libc               |                          []             []     [] |
-     libexif            |                       ()                          |
-     libextractor       |                                                   |
-     libgnutls          |                                                [] |
-     libgphoto2         |                                                [] |
-     libgphoto2_port    |                                                [] |
-     libgsasl           |                                                   |
-     libiconv           |                          []                    [] |
-     libidn             |                                                [] |
-     liferea            |          []    []                       []     [] |
-     lilypond           |                                         []     [] |
-     lordsawar          |                                         []        |
-     lprng              |                                                   |
-     lynx               |                                         []     [] |
-     m4                 |                                                [] |
-     mailfromd          |                                                   |
-     mailutils          |                                                   |
-     make               |                                                [] |
-     man-db             |                                         []     [] |
-     man-db-manpages    |                                                   |
-     midi-instruments   |          []                             []     [] |
-     minicom            |                                                [] |
-     mkisofs            |                                                [] |
-     myserver           |                                                [] |
-     nano               |                          []             []     [] |
-     opcodes            |                                                   |
-     parted             |                                                [] |
-     pies               |                                                   |
-     popt               |                                                [] |
-     procps-ng          |                                                   |
-     procps-ng-man      |                                                   |
-     psmisc             |                                                [] |
-     pspp               |                                         []        |
-     pushover           |                                                [] |
-     pwdutils           |                                                   |
-     pyspread           |                                                   |
-     radius             |                                         []        |
-     recode             |                       []                []     [] |
-     recutils           |                                                   |
-     rpm                |                                                   |
-     rush               |                                                   |
-     sarg               |                                                   |
-     sed                |                []                       []     [] |
-     sharutils          |                                                [] |
-     shishi             |                                                   |
-     skribilo           |                                                   |
-     solfege            |                                                [] |
-     solfege-manual     |                                                   |
-     spotmachine        |                                                   |
-     sudo               |                                         []     [] |
-     sudoers            |                                         []     [] |
-     sysstat            |                                                [] |
-     tar                |                          []             []     [] |
-     texinfo            |                                         []     [] |
-     texinfo_document   |                                         []        |
-     tigervnc           |                          []                       |
-     tin                |                                                   |
-     tin-man            |                                                   |
-     tracgoogleappsa... |                                                   |
-     trader             |                                                   |
-     util-linux         |                                                [] |
-     ve                 |                                                   |
-     vice               |                                                   |
-     vmm                |                                                   |
-     vorbis-tools       |                                                [] |
-     wastesedge         |                                                   |
-     wcd                |                                                   |
-     wcd-man            |                                                   |
-     wdiff              |                                         []     [] |
-     wget               |                                                [] |
-     wyslij-po          |                                                   |
-     xboard             |                                                   |
-     xdg-user-dirs      | []    []    [] []     [] []     []      [] []  [] |
-     xkeyboard-config   |                          []             []     [] |
-                        +---------------------------------------------------+
-                          af am an ar as ast az be bg bn bn_IN bs ca crh cs
-                           4  0  2  5  3 11   0  8 23  3   3    1 54  4  73
-
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr
-                        +--------------------------------------------------+
-     a2ps               | []  []  []     []         [] [] []       []  []  |
-     aegis              | []  []                       []              []  |
-     anubis             | []  []                       []          []  []  |
-     aspell             | []  []         []         [] []          []  []  |
-     bash               |                           [] []              []  |
-     bfd                | []                           []          []  []  |
-     binutils           |                              []          []  []  |
-     bison              | []  []  []                [] [] []       []  []  |
-     bison-runtime      | []  []  []                [] [] []       []  []  |
-     buzztrax           | []  []                                   []  []  |
-     ccd2cue            | []  []                                       []  |
-     ccide              | []  []                    [] []          []  []  |
-     cflow              | []  []                    []             []  []  |
-     clisp              | []  []     []                []              []  |
-     coreutils          | []  []                       [] []           []  |
-     cpio               | []  []                       []          []  []  |
-     cppi               | []  []                    []             []  []  |
-     cpplib             | []  []                    [] []          []  []  |
-     cryptsetup         | []  []                       []          []  []  |
-     datamash           | []  []                    []                 []  |
-     denemo             | []                                               |
-     dfarc              | []  []                    [] []          []  []  |
-     dialog             | []  []  []                [] []    [] [] []  []  |
-     dico               | []  []                                   []  []  |
-     diffutils          | []  []  []                [] []              []  |
-     dink               | []  []                    [] []          []  []  |
-     direvent           | []  []                    []                 []  |
-     doodle             | []  []                    []             []      |
-     dos2unix           | []  []                    [] []              []  |
-     dos2unix-man       |     []                       []              []  |
-     e2fsprogs          | []  []                    [] []              []  |
-     enscript           | []  []         []         []             []  []  |
-     exif               | []  []                    [] []          []  []  |
-     fetchmail          | []  ()  []     []         [] []              []  |
-     findutils          | []  []  []                [] [] []       []  []  |
-     flex               | []  []                    [] []          []  []  |
-     freedink           | []  []  []                [] []    []    []  []  |
-     fusionforge        |     []                       []              []  |
-     gas                |                              []          []  []  |
-     gawk               | []  []                       []          []  []  |
-     gcal               | []  []                       []              []  |
-     gcc                |     []                       []                  |
-     gdbm               | []  []                    []             []  []  |
-     gettext-examples   | []  []  []                [] []          []  []  |
-     gettext-runtime    | []  []                    [] []          []  []  |
-     gettext-tools      | []  []                       []          []  []  |
-     gjay               |     []                    []             []  []  |
-     glunarclock        | []  []                    []             []  []  |
-     gnubiff            |     ()                    []             []  ()  |
-     gnubik             | []  []                    []             []  []  |
-     gnucash            | []  ()  ()     ()            ()          ()  ()  |
-     gnuchess           |     []                    [] []              []  |
-     gnulib             | []  []                    [] [] []       []  []  |
-     gnunet             |                              []                  |
-     gnunet-gtk         |     []                                           |
-     gold               |                              []          []  []  |
-     gphoto2            | []  ()                    []                 []  |
-     gprof              | []  []                    [] []          []  []  |
-     gramadoir          | []  []                    []             []  []  |
-     grep               | []  []                    [] [] []       []  []  |
-     grub               | []  []                       []          []  []  |
-     gsasl              | []  []                    []             []  []  |
-     gss                | []  []                    []             []  []  |
-     gst-plugins-bad    | []  []                                           |
-     gst-plugins-base   | []  []  []                   []          []  []  |
-     gst-plugins-good   | []  []  []                   []    []    []  []  |
-     gst-plugins-ugly   | []  []  []                [] []    []    []  []  |
-     gstreamer          | []  []  []                   []    []    []  []  |
-     gtick              | []  ()                    []             []  []  |
-     gtkam              | []  ()                    [] []          []  []  |
-     gtkspell           | []  []  []                [] []    []    []  []  |
-     guix               | []                        []                     |
-     guix-packages      |                                                  |
-     gutenprint         | []  []                                   []  []  |
-     hello              | []  []  []                [] [] []       []  []  |
-     help2man           | []  []  []                [] []          []  []  |
-     help2man-texi      |     []                       []              []  |
-     hylafax            |     []                       []                  |
-     idutils            | []  []                    []             []  []  |
-     iso_15924          | []  ()                    [] []    ()    []  ()  |
-     iso_3166           | []  ()  []                [] [] [] ()    []  ()  |
-     iso_3166_2         | []  ()                             ()        ()  |
-     iso_4217           | []  ()  []                   [] [] ()    []  ()  |
-     iso_639            | []  ()                    [] []    ()    []  ()  |
-     iso_639_3          |     ()                             ()        ()  |
-     iso_639_5          |     ()                             ()        ()  |
-     jwhois             |     []                    [] []          []  []  |
-     kbd                | []  []  []                [] []              []  |
-     klavaro            | []  []  []                [] []    []        []  |
-     latrine            | []  ()                    []             []      |
-     ld                 | []                           []          []  []  |
-     leafpad            | []  []  []                [] []    []    []  []  |
-     libc               | []  []                       []          []  []  |
-     libexif            | []  []         ()            []              []  |
-     libextractor       |     []                                           |
-     libgnutls          |     []                    []             []  []  |
-     libgphoto2         | []  ()                                       []  |
-     libgphoto2_port    | []  ()                       []    []    []  []  |
-     libgsasl           | []  []                    []             []  []  |
-     libiconv           | []  []                    [] [] []       []  []  |
-     libidn             | []  []                    []             []  []  |
-     liferea            | []  ()  []                   []    []    []  []  |
-     lilypond           | []  []  []                [] []              []  |
-     lordsawar          | []  []                                           |
-     lprng              |                                                  |
-     lynx               | []  []                    []    []       []  []  |
-     m4                 | []  []  []                []             []  []  |
-     mailfromd          |                                              []  |
-     mailutils          |     []                       []          []  []  |
-     make               | []  []                       []          []  []  |
-     man-db             | []  []                    []                 []  |
-     man-db-manpages    |     []                                       []  |
-     midi-instruments   | []  []  []                [] [] []    [] []  []  |
-     minicom            | []  []                       []          []  []  |
-     mkisofs            |                           []             []  []  |
-     myserver           |     []                    []             []  []  |
-     nano               | []  []                    [] []    []    []  []  |
-     opcodes            | []  []                       []          []  []  |
-     parted             | []  []                                       []  |
-     pies               |     []                                           |
-     popt               | []  []                    [] []          []  []  |
-     procps-ng          |     []                                       []  |
-     procps-ng-man      |     []                                       []  |
-     psmisc             | []  []  []                []       []    []  []  |
-     pspp               |     []                       []              []  |
-     pushover           |     ()                    [] []              []  |
-     pwdutils           | []  []                                       []  |
-     pyspread           | []  []                                       []  |
-     radius             |                              []              []  |
-     recode             | []  []  []                [] []          []  []  |
-     recutils           |     []                       []          []  []  |
-     rpm                | []  []                    []             []  []  |
-     rush               |     []                                   []  []  |
-     sarg               | []                                           []  |
-     sed                | []  []  []                [] [] []       []  []  |
-     sharutils          |     []                    []    []           []  |
-     shishi             |     []                                   []  []  |
-     skribilo           | []                                           []  |
-     solfege            | []  []                    [] [] []    [] []  []  |
-     solfege-manual     |     []                    [] [] []           []  |
-     spotmachine        | []  []                    []             []      |
-     sudo               | []  []                    [] []          []  []  |
-     sudoers            | []  []  []                []             []  []  |
-     sysstat            | []  []                    [] []          []  []  |
-     tar                | []  []                    [] [] []       []  []  |
-     texinfo            | []  []                    [] []              []  |
-     texinfo_document   |     []                    [] []              []  |
-     tigervnc           | []  []  []                []             []  []  |
-     tin                | []  []                          []           []  |
-     tin-man            |                []                                |
-     tracgoogleappsa... | []  []                    []             []  []  |
-     trader             | []  []         []         []             []  []  |
-     util-linux         | []  []                       []              []  |
-     ve                 |     []                    [] []          []  []  |
-     vice               | ()  ()                                       ()  |
-     vmm                |     []                                   []      |
-     vorbis-tools       | []  []                    []                 []  |
-     wastesedge         | []                                           ()  |
-     wcd                |     []                    [] []          []      |
-     wcd-man            |     []                                           |
-     wdiff              | []  []                    [] [] []       []  []  |
-     wget               |     []                    [] [] []       []  []  |
-     wyslij-po          |     []                    []             []  []  |
-     xboard             | []  []                       []              []  |
-     xdg-user-dirs      | []  []  []                [] [] [] [] [] []  []  |
-     xkeyboard-config   | []  []  []                [] []          []  []  |
-                        +--------------------------------------------------+
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr
-                          120 130 32  1   6     0   94 95 22 13  4 103 136
-
-                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
-                        +-------------------------------------------------+
-     a2ps               |                   []          []    [] []       |
-     aegis              |                                     []          |
-     anubis             |                   [] []       []    []          |
-     aspell             | []                []          []    [] []       |
-     bash               |                               []    [] []       |
-     bfd                |                               []       []       |
-     binutils           |                               []    [] []       |
-     bison              |                   []                            |
-     bison-runtime      | []    []          [] []    [] []    [] []       |
-     buzztrax           |                                                 |
-     ccd2cue            |                      []                         |
-     ccide              |                   [] []                         |
-     cflow              | []                []          []                |
-     clisp              |                                                 |
-     coreutils          |                      []             [] []       |
-     cpio               | []                [] []       []    [] []       |
-     cppi               |       []          [] []             [] []       |
-     cpplib             |                               []       []       |
-     cryptsetup         |                                     []          |
-     datamash           |                                                 |
-     denemo             |                                     []          |
-     dfarc              |                   [] []             []          |
-     dialog             | [] [] []          [] []    [] [] [] [] []       |
-     dico               |                                                 |
-     diffutils          |                      []       []    [] []       |
-     dink               |                      []                         |
-     direvent           |                      []                         |
-     doodle             | []                                  []          |
-     dos2unix           |                      []                []       |
-     dos2unix-man       |                                                 |
-     e2fsprogs          |                               []                |
-     enscript           | []                []          []                |
-     exif               |       []          []          [] [] [] []       |
-     fetchmail          |                               []    [] []       |
-     findutils          | []    []          [] []       []    [] []       |
-     flex               | []                                              |
-     freedink           |                   [] []       []    []          |
-     fusionforge        |                                                 |
-     gas                |                               []                |
-     gawk               |                               []    () []       |
-     gcal               |                                                 |
-     gcc                |                                                 |
-     gdbm               |                                                 |
-     gettext-examples   | []    []          [] []       []    [] []       |
-     gettext-runtime    | []    []          [] []       []    [] []       |
-     gettext-tools      |                               []    [] []       |
-     gjay               |       []                                        |
-     glunarclock        | []    []          [] []       []    []          |
-     gnubiff            |                      []       []    ()          |
-     gnubik             |       []          []                []          |
-     gnucash            |          () () ()    ()             () []       |
-     gnuchess           |                                                 |
-     gnulib             | []    []             []             [] []       |
-     gnunet             |                                                 |
-     gnunet-gtk         |                                                 |
-     gold               |                               []    []          |
-     gphoto2            |                      []       []    [] []       |
-     gprof              | []                   []       []    []          |
-     gramadoir          | []                   []       []                |
-     grep               | []    []          [] []       []    [] []       |
-     grub               |       []             []             []          |
-     gsasl              | []                [] []       []    []          |
-     gss                | []                [] []       []    []          |
-     gst-plugins-bad    |                      []                         |
-     gst-plugins-base   |       []          [] []       []                |
-     gst-plugins-good   |       []          [] []       []    [] []       |
-     gst-plugins-ugly   |       []          [] []       []    [] []       |
-     gstreamer          |       []          [] []       []    []          |
-     gtick              | []    []             []       []    []          |
-     gtkam              |                      []       [] [] [] []       |
-     gtkspell           | []    []    []    [] [] []    [] [] [] []       |
-     guix               |                                                 |
-     guix-packages      |                                                 |
-     gutenprint         |       []             []             []          |
-     hello              | []    []          [] []       []                |
-     help2man           |                   []                [] []       |
-     help2man-texi      |                                                 |
-     hylafax            |                               []                |
-     idutils            |                      []       []                |
-     iso_15924          |       []             []    [] [] [] []          |
-     iso_3166           | []    [] [] [] [] [] []    [] [] [] [] []    [] |
-     iso_3166_2         |                               []    []          |
-     iso_4217           |                   [] []       [] [] [] []       |
-     iso_639            | []    [] []       [] []       [] [] [] []       |
-     iso_639_3          |       []                            []          |
-     iso_639_5          |                                                 |
-     jwhois             |       []             []       []    []          |
-     kbd                |                      []       []    []          |
-     klavaro            |       []          [] []             []       [] |
-     latrine            |                      []                         |
-     ld                 | []                            []    [] []       |
-     leafpad            | []    []    []    [] []       []    [] ()       |
-     libc               |       []          []          []    [] []       |
-     libexif            |                                     []          |
-     libextractor       |                                                 |
-     libgnutls          |                                     []          |
-     libgphoto2         |                                     [] []       |
-     libgphoto2_port    |                                     [] []       |
-     libgsasl           | []                   []       []    []          |
-     libiconv           | []    []          [] []       []    [] []       |
-     libidn             |                   [] []       []    []          |
-     liferea            |       []    []       []             [] []       |
-     lilypond           |                                     []          |
-     lordsawar          |                                                 |
-     lprng              |                               []                |
-     lynx               |                      []       []    [] []       |
-     m4                 | []    []          []          []       []       |
-     mailfromd          |                                                 |
-     mailutils          |                                                 |
-     make               |                   []          []    [] []       |
-     man-db             |                               []       []       |
-     man-db-manpages    |                               []       []       |
-     midi-instruments   |       []    []    [] [] []    [] [] [] []       |
-     minicom            |                      []       []       []       |
-     mkisofs            |                               []    []          |
-     myserver           |                                     []          |
-     nano               | []    []             []             [] []       |
-     opcodes            | []                            []    []          |
-     parted             |       []                      []    [] []       |
-     pies               |                                                 |
-     popt               | []    [] []       [] []    [] [] [] [] []       |
-     procps-ng          |                                                 |
-     procps-ng-man      |                                                 |
-     psmisc             |                   [] []       []    []          |
-     pspp               |       []                               []       |
-     pushover           |                                     []          |
-     pwdutils           |                               []                |
-     pyspread           |                                                 |
-     radius             |                               []                |
-     recode             | []    []    []    [] []       []    []          |
-     recutils           |                                                 |
-     rpm                |                               []                |
-     rush               |       []                                        |
-     sarg               |                                                 |
-     sed                | []    []          [] []       []    [] []       |
-     sharutils          |                                                 |
-     shishi             |                                                 |
-     skribilo           |                      []                         |
-     solfege            |       []                            []          |
-     solfege-manual     |                                                 |
-     spotmachine        |                                                 |
-     sudo               |       []          []                [] []       |
-     sudoers            |                   []                [] []       |
-     sysstat            |                      []       []       []       |
-     tar                | []                [] []       []    [] []       |
-     texinfo            |                   []          []    []          |
-     texinfo_document   |                      []             []          |
-     tigervnc           |                                                 |
-     tin                |                                                 |
-     tin-man            |                                                 |
-     tracgoogleappsa... |       []    []    [] []                         |
-     trader             |                   [] []                         |
-     util-linux         |                                        []       |
-     ve                 |                                     []          |
-     vice               |                      ()             ()          |
-     vmm                |                                                 |
-     vorbis-tools       |                   []          []                |
-     wastesedge         |                                     ()          |
-     wcd                |                                                 |
-     wcd-man            |                                                 |
-     wdiff              |       []             []             []          |
-     wget               |                      []             [] []       |
-     wyslij-po          |       []          []          []                |
-     xboard             |                                                 |
-     xdg-user-dirs      | [] [] [] [] [] [] [] []    [] [] [] [] []    [] |
-     xkeyboard-config   |       []             []       []    [] []       |
-                        +-------------------------------------------------+
-                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
-                          35  2 47  4  8  2 53 69  2  6 80 11 86 58  0  3
-
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
-                        +--------------------------------------------------+
-     a2ps               |                                  []          []  |
-     aegis              |                                              []  |
-     anubis             |                                  []    []    []  |
-     aspell             |                            []                []  |
-     bash               |                                        []    []  |
-     bfd                |                                                  |
-     binutils           |                                                  |
-     bison              |                                              []  |
-     bison-runtime      |          []    [] []             []    []    []  |
-     buzztrax           |                                                  |
-     ccd2cue            |                                                  |
-     ccide              |                   []                         []  |
-     cflow              |                                              []  |
-     clisp              |                                              []  |
-     coreutils          |                                        []    []  |
-     cpio               |                                              []  |
-     cppi               |                                                  |
-     cpplib             |                                              []  |
-     cryptsetup         |                                              []  |
-     datamash           |                                        []    []  |
-     denemo             |                                                  |
-     dfarc              |                      []                      []  |
-     dialog             |       []       [] []             []    []    []  |
-     dico               |                                                  |
-     diffutils          |                   []                   []    []  |
-     dink               |                                              []  |
-     direvent           |                                              []  |
-     doodle             |                                              []  |
-     dos2unix           |                                        []    []  |
-     dos2unix-man       |                                              []  |
-     e2fsprogs          |                                              []  |
-     enscript           |                                              []  |
-     exif               |                   []                         []  |
-     fetchmail          |                                              []  |
-     findutils          |                                        []    []  |
-     flex               |                                              []  |
-     freedink           |                                        []    []  |
-     fusionforge        |                                                  |
-     gas                |                                                  |
-     gawk               |                                              []  |
-     gcal               |                                                  |
-     gcc                |                                                  |
-     gdbm               |                                                  |
-     gettext-examples   |          []       []             [] [] []    []  |
-     gettext-runtime    |    []                                        []  |
-     gettext-tools      |    []                                            |
-     gjay               |                                                  |
-     glunarclock        |                   []                         []  |
-     gnubiff            |                                              []  |
-     gnubik             |                                        []    []  |
-     gnucash            | () ()          () ()          ()       () () []  |
-     gnuchess           |                                        []    []  |
-     gnulib             |                                              []  |
-     gnunet             |                                                  |
-     gnunet-gtk         |                                                  |
-     gold               |                                                  |
-     gphoto2            |                                              []  |
-     gprof              |                                  []          []  |
-     gramadoir          |                                              []  |
-     grep               |                                        []    []  |
-     grub               |                []                      []    []  |
-     gsasl              |                                              []  |
-     gss                |                                                  |
-     gst-plugins-bad    |                                        []    []  |
-     gst-plugins-base   |                   []                   []    []  |
-     gst-plugins-good   |                [] []                   []    []  |
-     gst-plugins-ugly   |                   []             [] [] []    []  |
-     gstreamer          |                []                            []  |
-     gtick              |                                              []  |
-     gtkam              |                                        []    []  |
-     gtkspell           |          []    [] []       []    []    []    []  |
-     guix               |                                                  |
-     guix-packages      |                                                  |
-     gutenprint         |                                              []  |
-     hello              |                   []                   []    []  |
-     help2man           |                                        []        |
-     help2man-texi      |                                                  |
-     hylafax            |                                              []  |
-     idutils            |                                              []  |
-     iso_15924          |                () []                         []  |
-     iso_3166           | [] [] []       () [] [] []    []       []    []  |
-     iso_3166_2         |                ()                            []  |
-     iso_4217           |                () []                   []    []  |
-     iso_639            | [] []          () []    []    []             []  |
-     iso_639_3          | []             ()             []                 |
-     iso_639_5          |                ()                                |
-     jwhois             |                   []                         []  |
-     kbd                |                                              []  |
-     klavaro            |                                        []    []  |
-     latrine            |                                                  |
-     ld                 |                                                  |
-     leafpad            |    []    []    [] []                         []  |
-     libc               |    []                                        []  |
-     libexif            |                                              []  |
-     libextractor       |                                              []  |
-     libgnutls          |                                  []          []  |
-     libgphoto2         |                                              []  |
-     libgphoto2_port    |                                              []  |
-     libgsasl           |                                              []  |
-     libiconv           |                []                            []  |
-     libidn             |                                              []  |
-     liferea            |                [] []                         []  |
-     lilypond           |                                              []  |
-     lordsawar          |                                                  |
-     lprng              |                                                  |
-     lynx               |                                              []  |
-     m4                 |                                              []  |
-     mailfromd          |                                                  |
-     mailutils          |                                                  |
-     make               |    []                                        []  |
-     man-db             |                                              []  |
-     man-db-manpages    |                                              []  |
-     midi-instruments   |    [] []       []          []    []       [] []  |
-     minicom            |                                        []        |
-     mkisofs            |                                              []  |
-     myserver           |                                                  |
-     nano               |                                  []    []    []  |
-     opcodes            |                                              []  |
-     parted             |                                              []  |
-     pies               |                                                  |
-     popt               | [] []             []                   []    []  |
-     procps-ng          |                                                  |
-     procps-ng-man      |                                                  |
-     psmisc             |                                              []  |
-     pspp               |                []                            []  |
-     pushover           |                                                  |
-     pwdutils           |                                              []  |
-     pyspread           |                                                  |
-     radius             |                                              []  |
-     recode             |                                        []    []  |
-     recutils           |                                              []  |
-     rpm                |                                              []  |
-     rush               |                                              []  |
-     sarg               |                                                  |
-     sed                |                                        []    []  |
-     sharutils          |                                              []  |
-     shishi             |                                                  |
-     skribilo           |                                                  |
-     solfege            |                                        []    []  |
-     solfege-manual     |                                              []  |
-     spotmachine        |                                              []  |
-     sudo               |                                        []    []  |
-     sudoers            |                                        []    []  |
-     sysstat            |                                        []    []  |
-     tar                |          []                            []    []  |
-     texinfo            |                                              []  |
-     texinfo_document   |                                              []  |
-     tigervnc           |                                              []  |
-     tin                |                                                  |
-     tin-man            |                                                  |
-     tracgoogleappsa... |                   []                   []    []  |
-     trader             |                                        []        |
-     util-linux         |                                              []  |
-     ve                 |                                              []  |
-     vice               |                                              []  |
-     vmm                |                                              []  |
-     vorbis-tools       |                                              []  |
-     wastesedge         |                                              []  |
-     wcd                |                                              []  |
-     wcd-man            |                                              []  |
-     wdiff              |                                              []  |
-     wget               |                                        []    []  |
-     wyslij-po          |                                              []  |
-     xboard             |                                              []  |
-     xdg-user-dirs      | [] [] [] []    [] [] [] []    []       []    []  |
-     xkeyboard-config   |    []          []                            []  |
-                        +--------------------------------------------------+
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
-                           5 11  4  6  0 13 22  3  3  3  4 11  2 40  1 124
-
-                          nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-                        +--------------------------------------------------+
-     a2ps               |             []     []  []   [] []       []    [] |
-     aegis              |                        []      []                |
-     anubis             |             []                 []             [] |
-     aspell             |             []         []   [] []    [] []    [] |
-     bash               |             []                 []    [] []    [] |
-     bfd                |                                []                |
-     binutils           |                                []             [] |
-     bison              |             []         []                     [] |
-     bison-runtime      |             []     []  []   [] []       [] [] [] |
-     buzztrax           |                                                  |
-     ccd2cue            |                        []                        |
-     ccide              |             []                 []             [] |
-     cflow              |             []                                [] |
-     clisp              |                                []                |
-     coreutils          |             []                 []       []    [] |
-     cpio               |             []                 []             [] |
-     cppi               |             []         []                     [] |
-     cpplib             |                        []      []             [] |
-     cryptsetup         |             []                                [] |
-     datamash           |                        []                     [] |
-     denemo             |                                                  |
-     dfarc              |             []         []                     [] |
-     dialog             |             []         []   [] []    [] []    [] |
-     dico               |             []                                   |
-     diffutils          |             []                                [] |
-     dink               |                                                  |
-     direvent           |             []         []                        |
-     doodle             |                                            [] [] |
-     dos2unix           |             []         []      []             [] |
-     dos2unix-man       |             []         []                        |
-     e2fsprogs          |             []                                   |
-     enscript           |             []         []   [] []       []    [] |
-     exif               |             []         []   [] []    []       [] |
-     fetchmail          |             []                 []          []    |
-     findutils          |             []         []      []       []    [] |
-     flex               |             []         []   [] []             [] |
-     freedink           |             []         []      []       []    [] |
-     fusionforge        |                                                  |
-     gas                |                                                  |
-     gawk               |             []                                   |
-     gcal               |                                                  |
-     gcc                |                                                  |
-     gdbm               |             []         []                     [] |
-     gettext-examples   |             []     []  []   [] []    [] []    [] |
-     gettext-runtime    | []          []     []  []   [] []    [] []    [] |
-     gettext-tools      |             []         []   [] []    [] []    [] |
-     gjay               |                                               [] |
-     glunarclock        |             []         []   []       [] []    [] |
-     gnubiff            |                                               [] |
-     gnubik             |             []         []               []    [] |
-     gnucash            |             ()         ()   () ()             [] |
-     gnuchess           |                        []                     [] |
-     gnulib             |             []         []      []       []    [] |
-     gnunet             |                                                  |
-     gnunet-gtk         |                                                  |
-     gold               |                                                  |
-     gphoto2            |             []         []   [] []             [] |
-     gprof              |                        []   [] []             [] |
-     gramadoir          |                                      []       [] |
-     grep               |             []         []      []    [] []    [] |
-     grub               |             []         []      []       []    [] |
-     gsasl              |             []                       []       [] |
-     gss                |             []              []       []       [] |
-     gst-plugins-bad    |             []         []      []             [] |
-     gst-plugins-base   |             []         []      []    [] []    [] |
-     gst-plugins-good   |             []         []   [] []    [] []    [] |
-     gst-plugins-ugly   |             []         []   [] []    [] []    [] |
-     gstreamer          |             []         []   [] []    [] []    [] |
-     gtick              |             []         []      []    []       [] |
-     gtkam              |          [] []         []      []    []       [] |
-     gtkspell           |             []     []  []   [] []    [] [] [] [] |
-     guix               |                                                  |
-     guix-packages      |                                                  |
-     gutenprint         |                                      [] []       |
-     hello              |             []         []      []    [] []    [] |
-     help2man           |             []         []      []             [] |
-     help2man-texi      |             []                                   |
-     hylafax            |                                                  |
-     idutils            |             []                 []             [] |
-     iso_15924          |             []     ()       [] []       []    [] |
-     iso_3166           | [] []    [] []     ()  []   [] [] [] [] [] [] [] |
-     iso_3166_2         |             []     ()                         [] |
-     iso_4217           | []          []     ()       [] [] []    []    [] |
-     iso_639            |    []    [] []     ()       [] [] [] [] []    [] |
-     iso_639_3          |          []        ()                            |
-     iso_639_5          |                    ()                         [] |
-     jwhois             |             []         []   []                [] |
-     kbd                |             []                 []                |
-     klavaro            |          [] []         []      []       []       |
-     latrine            |                        []                        |
-     ld                 |                                                  |
-     leafpad            | []    []    []     []  []      []    [] []    [] |
-     libc               |             []                 []    []          |
-     libexif            |             []         ()            []          |
-     libextractor       |             []                                   |
-     libgnutls          |             []                                   |
-     libgphoto2         |             []                                   |
-     libgphoto2_port    |             []         []      []    []       [] |
-     libgsasl           |             []              []       []       [] |
-     libiconv           |             []         []            [] []    [] |
-     libidn             |             []         []                     [] |
-     liferea            |             []     []  []   [] ()    []    []    |
-     lilypond           |                                                  |
-     lordsawar          |                                                  |
-     lprng              |             []                                   |
-     lynx               |                        []      []                |
-     m4                 |             []         []   [] []             [] |
-     mailfromd          |             []                                   |
-     mailutils          |             []                                   |
-     make               |             []         []      []                |
-     man-db             |             []                 []             [] |
-     man-db-manpages    |             []                 []             [] |
-     midi-instruments   |             []     []  []   [] []    [] []    [] |
-     minicom            |             []         []   [] []                |
-     mkisofs            |             []                 []             [] |
-     myserver           |                                         []    [] |
-     nano               |             []         []   [] []       []    [] |
-     opcodes            |                                                  |
-     parted             |             []         []      []    [] []    [] |
-     pies               |             []                                   |
-     popt               |             []     []  []      []       []    [] |
-     procps-ng          |             []                                   |
-     procps-ng-man      |             []                                   |
-     psmisc             |             []         []      []             [] |
-     pspp               |             []                 []                |
-     pushover           |                                                  |
-     pwdutils           |             []                                   |
-     pyspread           | []                     []                        |
-     radius             |             []                 []                |
-     recode             |             []     []  []   [] []    [] []    [] |
-     recutils           |                                               [] |
-     rpm                |             []                                   |
-     rush               |             []         []                     [] |
-     sarg               |                        []      []                |
-     sed                |             []     []  []   [] []    [] []    [] |
-     sharutils          |             []         []                     [] |
-     shishi             |             []                                [] |
-     skribilo           |                                                  |
-     solfege            |             []         []      []                |
-     solfege-manual     |             []         []                        |
-     spotmachine        |                        []                     [] |
-     sudo               |             []         []      []    [] []    [] |
-     sudoers            |             []         []               []    [] |
-     sysstat            |             []         []      []    []       [] |
-     tar                |             []         []      []       []    [] |
-     texinfo            |             []         []      []                |
-     texinfo_document   |             []         []                        |
-     tigervnc           |                        []                        |
-     tin                |                                []                |
-     tin-man            |                                                  |
-     tracgoogleappsa... |             []         []      []             [] |
-     trader             |                                []                |
-     util-linux         |             []         []                        |
-     ve                 |             []         []                     [] |
-     vice               |                                                  |
-     vmm                |                                                  |
-     vorbis-tools       |             []                          []    [] |
-     wastesedge         |                                                  |
-     wcd                |                                                  |
-     wcd-man            |                                                  |
-     wdiff              |             []         []      []       []    [] |
-     wget               |             []         []      []    []          |
-     wyslij-po          | []          []         []                     [] |
-     xboard             |             []                 []             [] |
-     xdg-user-dirs      | [] []    [] []  [] []  []   [] []    [] [] [] [] |
-     xkeyboard-config   |             []         []      []       []       |
-                        +--------------------------------------------------+
-                          nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-                           7  3  1  6 114  1 12  83   32 80  3 38 45  7 94
-
-                          sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
-                        +---------------------------------------------------+
-     a2ps               | []             [] [] []     []                    |
-     aegis              |                             []                    |
-     anubis             | []                [] []     []                    |
-     aspell             |                      []     []  []     []         |
-     bash               | []                   []     []         []         |
-     bfd                |                      []     []                    |
-     binutils           | []                   []     []                    |
-     bison              | []                   []     []         []         |
-     bison-runtime      | []             [] [] []     []         []         |
-     buzztrax           | []                          []         []         |
-     ccd2cue            |                      []     []         []         |
-     ccide              | []                   []     []         []         |
-     cflow              | []                   []     []         []         |
-     clisp              |                                                   |
-     coreutils          | []                   []     []         []         |
-     cpio               | []                [] []     []         []         |
-     cppi               | []                   []     []         []         |
-     cpplib             | []                [] []     []         []         |
-     cryptsetup         |                      []     []         []         |
-     datamash           | []                   []     []                    |
-     denemo             |                                                   |
-     dfarc              |                             []                    |
-     dialog             | [] []          []           []  []     []         |
-     dico               |                      []                           |
-     diffutils          | []                [] []     []         []         |
-     dink               |                                                   |
-     direvent           |                      []     []                    |
-     doodle             | []                          []                    |
-     dos2unix           | []                   []     []         []         |
-     dos2unix-man       | []                   []                []         |
-     e2fsprogs          | []                   []     []         []         |
-     enscript           | []                [] []     []                    |
-     exif               | []                [] []     []         []         |
-     fetchmail          | []                []        []         []         |
-     findutils          | []                [] []     []         []         |
-     flex               | []                []        []         []         |
-     freedink           |                []           []                    |
-     fusionforge        |                                                   |
-     gas                |                      []                           |
-     gawk               | []                          []                    |
-     gcal               | []                []                              |
-     gcc                | []                                     []         |
-     gdbm               |                      []     []                    |
-     gettext-examples   | []                [] []     []         []    []   |
-     gettext-runtime    | []                [] []     []         []    []   |
-     gettext-tools      | []                [] []     []         []         |
-     gjay               |                []           []                    |
-     glunarclock        | []                          []  []     []         |
-     gnubiff            | []                          []                    |
-     gnubik             | []                   []     []         []         |
-     gnucash            |       () ()              () ()         []         |
-     gnuchess           |                      []     []                    |
-     gnulib             | []                   []     []         []         |
-     gnunet             |                                                   |
-     gnunet-gtk         |                                                   |
-     gold               |                      []     []                    |
-     gphoto2            | []                   []     []         []         |
-     gprof              | []                [] []     []                    |
-     gramadoir          | []                          []         []         |
-     grep               | []             []    []     []         []         |
-     grub               | []                [] []     []                    |
-     gsasl              | []                   []     []         []         |
-     gss                | []                          []         []         |
-     gst-plugins-bad    | []                   []     []         []         |
-     gst-plugins-base   | []                [] []     []         []         |
-     gst-plugins-good   | []                [] []     []         []         |
-     gst-plugins-ugly   | []                [] []     []         []         |
-     gstreamer          | []                [] []     []         []         |
-     gtick              |                      []     []         []         |
-     gtkam              | []                   []     []         []         |
-     gtkspell           | []             [] [] []     []  []     []    []   |
-     guix               |                             []                    |
-     guix-packages      |                                                   |
-     gutenprint         |                   [] []     []         []         |
-     hello              | []             [] [] []     []         []         |
-     help2man           |                      []     []         []         |
-     help2man-texi      |                      []                           |
-     hylafax            |                             []                    |
-     idutils            |                      []     []         []         |
-     iso_15924          | []             () [] []     ()         []         |
-     iso_3166           | []       []    () [] []     ()  []     []    []   |
-     iso_3166_2         |                () [] []     ()         []         |
-     iso_4217           | []             () [] []     ()         []    []   |
-     iso_639            | []    [] []    () [] []     ()  []     []    []   |
-     iso_639_3          |       []       () [] []     ()                    |
-     iso_639_5          |                ()    []     ()                    |
-     jwhois             | []                []        []         []         |
-     kbd                |                      []     []         []         |
-     klavaro            | []                   []  [] []     []  []         |
-     latrine            |                             []         []         |
-     ld                 | []                [] []     []         []         |
-     leafpad            | []             [] [] []     []         []         |
-     libc               | []                [] []     []         []         |
-     libexif            |                             []         ()         |
-     libextractor       |                      []     []                    |
-     libgnutls          | []                   []     []         []         |
-     libgphoto2         |                      []     []                    |
-     libgphoto2_port    | []                   []     []         []         |
-     libgsasl           | []                   []     []         []         |
-     libiconv           | []                   []     []  []     []         |
-     libidn             | ()                   []     []         []         |
-     liferea            | []                [] []     []         []         |
-     lilypond           |                             []                    |
-     lordsawar          |                                                   |
-     lprng              |                             []                    |
-     lynx               | []                [] []     []                    |
-     m4                 | []                          []         []         |
-     mailfromd          |                      []     []                    |
-     mailutils          |                             []                    |
-     make               | []                   []     []         []         |
-     man-db             |                             []         []         |
-     man-db-manpages    |                                        []         |
-     midi-instruments   | []             [] [] []     []         []         |
-     minicom            | []                          []                    |
-     mkisofs            |                      []     []         []         |
-     myserver           |                             []                    |
-     nano               | []                   []     []         []         |
-     opcodes            |                      []     []         []         |
-     parted             | []                [] []     []         []         |
-     pies               |                      []     []                    |
-     popt               | []    []       [] [] []     []         []         |
-     procps-ng          |                      []     []                    |
-     procps-ng-man      |                      []                           |
-     psmisc             | []                   []     []         []         |
-     pspp               |                   [] []                []         |
-     pushover           | []                                                |
-     pwdutils           | []                          []                    |
-     pyspread           |                      []                           |
-     radius             |                      []     []                    |
-     recode             | []                []        []         []         |
-     recutils           | []                   []     []                    |
-     rpm                | []                   []     []         []         |
-     rush               |                      []     []                    |
-     sarg               |                                                   |
-     sed                | []                [] []     []         []         |
-     sharutils          |                      []     []         []         |
-     shishi             |                             []         []         |
-     skribilo           | []                                                |
-     solfege            |                   []        []         []         |
-     solfege-manual     |                   []                              |
-     spotmachine        | []                   []     []                    |
-     sudo               |                   [] []     []         []         |
-     sudoers            |                      []     []         []         |
-     sysstat            | []                [] []     []         []         |
-     tar                | []                [] []     []         []         |
-     texinfo            |                   [] []     []                    |
-     texinfo_document   |                      []                           |
-     tigervnc           | []                   []                           |
-     tin                |                                        []         |
-     tin-man            |                                                   |
-     tracgoogleappsa... | []             []    []     []         []         |
-     trader             | []                                                |
-     util-linux         |                      []     []         []         |
-     ve                 | []                   []     []         []         |
-     vice               | ()                ()                              |
-     vmm                |                                                   |
-     vorbis-tools       | []                          []                    |
-     wastesedge         |                                                   |
-     wcd                |                      []     []         []         |
-     wcd-man            |                      []                           |
-     wdiff              | []                   []     []         []         |
-     wget               |                      []     []         []         |
-     wyslij-po          |                      []     []                    |
-     xboard             |                      []                           |
-     xdg-user-dirs      | []    [] []    [] [] []     []         []    []   |
-     xkeyboard-config   | []                [] []     []                    |
-                        +---------------------------------------------------+
-                          sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
-                          91  1  4  3  0 13 50 113  1 126  7  1  95     7
-
-                          zh_TW
-                        +-------+
-     a2ps               |       | 30
-     aegis              |       |  9
-     anubis             |       | 19
-     aspell             |       | 28
-     bash               |  []   | 21
-     bfd                |       |  9
-     binutils           |       | 12
-     bison              |  []   | 18
-     bison-runtime      |  []   | 38
-     buzztrax           |       |  8
-     ccd2cue            |       |  8
-     ccide              |       | 17
-     cflow              |       | 15
-     clisp              |       | 10
-     coreutils          |       | 20
-     cpio               |       | 20
-     cppi               |       | 17
-     cpplib             |  []   | 19
-     cryptsetup         |       | 13
-     datamash           |       | 11
-     denemo             |       |  4
-     dfarc              |       | 16
-     dialog             |  []   | 42
-     dico               |       |  6
-     diffutils          |       | 21
-     dink               |       |  9
-     direvent           |       | 10
-     doodle             |       | 12
-     dos2unix           |  []   | 18
-     dos2unix-man       |       |  9
-     e2fsprogs          |       | 14
-     enscript           |       | 21
-     exif               |       | 26
-     fetchmail          |       | 19
-     findutils          |       | 28
-     flex               |  []   | 19
-     freedink           |       | 23
-     fusionforge        |       |  3
-     gas                |       |  5
-     gawk               |       | 12
-     gcal               |       |  7
-     gcc                |       |  4
-     gdbm               |       | 10
-     gettext-examples   |  []   | 40
-     gettext-runtime    |  []   | 34
-     gettext-tools      |  []   | 24
-     gjay               |       |  8
-     glunarclock        |  []   | 27
-     gnubiff            |       |  9
-     gnubik             |       | 19
-     gnucash            |  ()   |  7
-     gnuchess           |       | 10
-     gnulib             |       | 23
-     gnunet             |       |  1
-     gnunet-gtk         |       |  1
-     gold               |       |  7
-     gphoto2            |  []   | 19
-     gprof              |       | 21
-     gramadoir          |       | 14
-     grep               |  []   | 31
-     grub               |       | 21
-     gsasl              |  []   | 19
-     gss                |       | 17
-     gst-plugins-bad    |       | 14
-     gst-plugins-base   |       | 27
-     gst-plugins-good   |       | 32
-     gst-plugins-ugly   |       | 34
-     gstreamer          |  []   | 31
-     gtick              |       | 19
-     gtkam              |       | 24
-     gtkspell           |  []   | 48
-     guix               |       |  3
-     guix-packages      |       |  0
-     gutenprint         |       | 15
-     hello              |  []   | 30
-     help2man           |       | 18
-     help2man-texi      |       |  5
-     hylafax            |       |  5
-     idutils            |       | 14
-     iso_15924          |  []   | 23
-     iso_3166           |  []   | 58
-     iso_3166_2         |       |  9
-     iso_4217           |  []   | 28
-     iso_639            |  []   | 46
-     iso_639_3          |       | 10
-     iso_639_5          |       |  2
-     jwhois             |  []   | 20
-     kbd                |       | 16
-     klavaro            |       | 30
-     latrine            |       |  7
-     ld                 |  []   | 15
-     leafpad            |  []   | 40
-     libc               |  []   | 24
-     libexif            |       |  9
-     libextractor       |       |  5
-     libgnutls          |       | 13
-     libgphoto2         |       |  9
-     libgphoto2_port    |  []   | 19
-     libgsasl           |       | 18
-     libiconv           |  []   | 29
-     libidn             |       | 17
-     liferea            |       | 29
-     lilypond           |       | 11
-     lordsawar          |       |  3
-     lprng              |       |  3
-     lynx               |       | 19
-     m4                 |  []   | 22
-     mailfromd          |       |  4
-     mailutils          |       |  6
-     make               |       | 19
-     man-db             |       | 14
-     man-db-manpages    |       |  9
-     midi-instruments   |  []   | 43
-     minicom            |  []   | 17
-     mkisofs            |       | 13
-     myserver           |       |  9
-     nano               |  []   | 29
-     opcodes            |       | 12
-     parted             |  []   | 21
-     pies               |       |  4
-     popt               |  []   | 36
-     procps-ng          |       |  5
-     procps-ng-man      |       |  4
-     psmisc             |  []   | 22
-     pspp               |       | 13
-     pushover           |       |  6
-     pwdutils           |       |  8
-     pyspread           |       |  6
-     radius             |       |  9
-     recode             |       | 31
-     recutils           |       |  9
-     rpm                |  []   | 13
-     rush               |       | 10
-     sarg               |       |  4
-     sed                |  []   | 34
-     sharutils          |       | 12
-     shishi             |       |  7
-     skribilo           |       |  4
-     solfege            |       | 19
-     solfege-manual     |       |  9
-     spotmachine        |       | 10
-     sudo               |       | 24
-     sudoers            |       | 20
-     sysstat            |       | 22
-     tar                |  []   | 30
-     texinfo            |       | 17
-     texinfo_document   |       | 11
-     tigervnc           |       | 11
-     tin                |  []   |  7
-     tin-man            |       |  1
-     tracgoogleappsa... |  []   | 22
-     trader             |       | 11
-     util-linux         |       | 12
-     ve                 |       | 14
-     vice               |       |  1
-     vmm                |       |  3
-     vorbis-tools       |       | 13
-     wastesedge         |       |  2
-     wcd                |       |  8
-     wcd-man            |       |  3
-     wdiff              |  []   | 23
-     wget               |       | 19
-     wyslij-po          |       | 14
-     xboard             |       |  9
-     xdg-user-dirs      |  []   | 68
-     xkeyboard-config   |  []   | 27
-                        +-------+
-       90 teams           zh_TW
-      166 domains          42    2748
-
-   Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect.  This is because a few extra PO files are
-used for implementing regional variants of languages, or language
-dialects.
-
-   For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and distributed
-as such by its maintainer.  There might be an observable lag between the
-mere existence a PO file and its wide availability in a distribution.
-
-   If Jun 2014 seems to be old, you may fetch a more recent copy of this
-'ABOUT-NLS' file on most GNU archive sites.  The most up-to-date matrix
-with full percentage details can be found at
-'http://translationproject.org/extra/matrix.html'.
-
-1.5 Using 'gettext' in new packages
-===================================
-
-If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU 'gettext' in your
-package.  Of course you have to respect the GNU Lesser General Public
-License which covers the use of the GNU 'gettext' library.  This means
-in particular that even non-free programs can use 'libintl' as a shared
-library, whereas only free software can use 'libintl' as a static
-library or use modified versions of 'libintl'.
-
-   Once the sources are changed appropriately and the setup can handle
-the use of 'gettext' the only thing missing are the translations.  The
-Free Translation Project is also available for packages which are not
-developed inside the GNU project.  Therefore the information given above
-applies also for every other Free Software Project.  Contact
-'coordinator@translationproject.org' to make the '.pot' files available
-to the translation teams.
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 1ceb07a..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS = src data help po
-
-ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
-
-EXTRA_DIST = \
-	README.md \
-	autogen.sh \
-	simple-scan.doap
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 4fafb73..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,811 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) 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 \
-      *\\[\ \	]*) \
-        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; \
-  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@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(am__DIST_COMMON)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-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_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 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;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-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)
-am__DIST_COMMON = $(srcdir)/Makefile.in ABOUT-NLS COPYING NEWS compile \
-	config.guess config.rpath config.sub depcomp install-sh \
-	missing
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && 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,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-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$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPSTREAM_UTIL = @APPSTREAM_UTIL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COLORD_CFLAGS = @COLORD_CFLAGS@
-COLORD_LIBS = @COLORD_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-ITSTOOL = @ITSTOOL@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
-PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMLLINT = @XMLLINT@
-YELP_LC_DIST = @YELP_LC_DIST@
-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-appstreamxmldir = @appstreamxmldir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = src data help po
-ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
-EXTRA_DIST = \
-	README.md \
-	autogen.sh \
-	simple-scan.doap
-
-all: all-recursive
-
-.SUFFIXES:
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-# 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.
-$(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//`; \
-	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; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-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
-
-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)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
-
-dist-tarZ: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
-
-dist-shar: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__post_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
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build/sub \
-	  && ../../configure \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=../.. --prefix="$$dc_install_base" \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(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'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-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-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-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
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/NEWS b/NEWS
index 0811aef..2767ed0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,66 @@
+Overview of changes in simple-scan 3.26.2
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.26.1
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.26.0
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.25.92
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.25.91
+
+  * Added Snap packaging
+
+Overview of changes in simple-scan 3.25.90
+
+  * Fix grammar in preferences dialog
+
+Overview of changes in simple-scan 3.25.4
+
+  * Add a shortcut window
+  * Fix application ID to match resources names
+
+Overview of changes in simple-scan 3.25.3
+
+  * Add support for lossy webp image.
+  * More preferences dialog design improvements.
+  * Make saving asyncronous, multithreaded, cancellable.
+  * Add colour to scan button.
+  * Put email entry in hamburger menu (was removed in design changes).
+  * Don't show welcome page if autloaded document.
+  * Fix scan menu not working Unity/XFCE/MATE etc.
+  * Don't use headerbar on i3 desktop.
+  * Set a minimal version number for packagekit-glib2.
+  * Translatable string / build rules improvements.
+
+Overview of changes in simple-scan 3.25.2
+
+  * Redesign preferences dialog.
+  * Move JPEG compression control to save dialog.
+  * Replace blank page with a homescreen that shows scanner status.
+  * Simplify header bar controls.
+  * Move page controls to an action bar below scanned page.
+  * Improve algorithm that picks JPEG or zlib compression for PDF files.
+  * Restrict image file filter to supported image formats.
+  * Fix compilation with Vala 0.36.
+  * Remove obsolete code.
+
+Overview of changes in simple-scan 3.25.1
+
+  * Check if files exist in multi-file saves
+  * Remove "Save As" - save now always prompts when overwriting
+  * Add a continuous scan option
+  * Make email and print actions insensitive when document empty
+  * Remove .ps and .tiff output support - this is not required
+  * Switch from autotools to Meson
+
 Overview of changes in simple-scan 3.24.0
 
   * No change version bump
diff --git a/README.md b/README.md
index 416f0f7..2034383 100644
--- a/README.md
+++ b/README.md
@@ -10,41 +10,25 @@ 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:
-
+Install the dependencies (on Ubuntu/Debian):
 ```
-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.22 vala-0.22
-sudo update-alternatives --config valac # select vala-0.22
-
-# one of the follwing
-./autogen.sh                           # system-wide installation
-./autogen.sh --prefix=`pwd`/install    # for development purposes
-
-make
-make install
-./install/bin/simple-scan
+$ sudo apt install bzr meson valac libgtk-3-dev libgusb-dev libcolord-dev libpackagekit-glib2-dev libwebp-dev libsane-dev gettext itstool
 ```
 
-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.
-
+Get the source:
+```
+$ bzr branch lp:simple-scan
+```
 
+Build locally with:
+```
+$ meson --prefix $PWD/install build/
+$ ninja -C build/ all install
+$ XDG_DATA_DIRS=install/share:$XDG_DATA_DIRS ./install/bin/simple-scan
+```
 
 ## 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
@@ -65,8 +49,6 @@ 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
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index a370d2f..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,1239 +0,0 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# 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'.])])
-
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[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
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2014 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.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# 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
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_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],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 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"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [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='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # 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
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # 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'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 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.
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.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
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[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], [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
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([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 (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_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])],
-		  [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
-])
-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
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi
-dnl The trailing newline in this macro's definition is deliberate, for
-dnl backward compatibility and to allow trailing 'dnl'-style comments
-dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
-])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST([install_sh])])
-
-# Copyright (C) 2003-2014 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.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless 'enable' is passed literally.
-# For symmetry, 'disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-    [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
-  AC_SUBST([MAINT])dnl
-]
-)
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# 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
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-esac
-
-# 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 (
-   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
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-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-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [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 do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [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])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-#
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# 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'
-
-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
-
-    # 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
-
-  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-2014 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.
-
-# 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], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# --------------------------------------------------------------------------
-AC_DEFUN([AM_PROG_VALAC],
-  [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])
-          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])
-
-m4_include([m4/appstream-xml.m4])
-m4_include([m4/gettext.m4])
-m4_include([m4/gsettings.m4])
-m4_include([m4/iconv.m4])
-m4_include([m4/intlmacosx.m4])
-m4_include([m4/lib-ld.m4])
-m4_include([m4/lib-link.m4])
-m4_include([m4/lib-prefix.m4])
-m4_include([m4/nls.m4])
-m4_include([m4/pkg.m4])
-m4_include([m4/po.m4])
-m4_include([m4/progtest.m4])
-m4_include([m4/yelp.m4])
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index aaf9fdb..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-(test -f $srcdir/configure.ac) || {
-        echo "**Error**: Directory "\`$srcdir\'" does not look like the top-level project directory"
-        exit 1
-}
-
-PKG_NAME=`autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac"`
-
-if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
-        echo "**Warning**: I am going to run \`configure' with no arguments." >&2
-        echo "If you wish to pass any to it, please specify them on the" >&2
-        echo \`$0\'" command line." >&2
-        echo "" >&2
-fi
-
-set -x
-aclocal --install || exit 1
-autoreconf --verbose --force --install -Wno-portability || exit 1
-{ set +x; } 2>/dev/null
-
-if [ "$NOCONFIGURE" = "" ]; then
-        set -x
-        $srcdir/configure "$@" || exit 1
-        { set +x; } 2>/dev/null
-
-        if [ "$1" = "--help" ]; then exit 0 else
-                echo "Now type \`make\' to compile $PKG_NAME" || exit 1
-        fi
-else
-        echo "Skipping configure process."
-fi
diff --git a/compile b/compile
deleted file mode 100755
index a85b723..0000000
--- a/compile
+++ /dev/null
@@ -1,347 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-10-14.11; # UTC
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      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
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/config.guess b/config.guess
deleted file mode 100755
index 2e9ad7f..0000000
--- a/config.guess
+++ /dev/null
@@ -1,1462 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
-
-timestamp='2016-10-02'
-
-# This file 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.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-#
-# Please send patches to <config-patches@gnu.org>.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    /sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || \
-	    echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
-		machine=${arch}${endian}-unknown
-		;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently (or will in the future) and ABI.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		os=netbsdelf
-		;;
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}${abi}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:Sortix:*:*)
-	echo ${UNAME_MACHINE}-unknown-sortix
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE=alpha ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE=alphaev5 ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE=alphaev56 ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE=alphapca56 ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE=alphapca57 ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE=alphaev6 ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE=alphaev67 ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE=alphaev69 ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE=alphaev7 ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE=alphaev79 ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/lslpp ] ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH=hppa2.0n ;;
-			  64) HP_ARCH=hppa2.0w ;;
-			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = hppa2.0w ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH=hppa2.0w
-	    else
-		HP_ARCH=hppa64
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    e2k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    k1om:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-	;;
-    mips64el:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
-	exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = x86; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = 386; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-    amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
-esac
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-If $0 has already been updated, send the following data and any
-information you think might be pertinent to config-patches@gnu.org to
-provide the necessary information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.rpath b/config.rpath
deleted file mode 100755
index a3e25c8..0000000
--- a/config.rpath
+++ /dev/null
@@ -1,684 +0,0 @@
-#! /bin/sh
-# Output a system dependent set of variables, describing how to set the
-# run time search path of shared libraries in an executable.
-#
-#   Copyright 1996-2015 Free Software Foundation, Inc.
-#   Taken from GNU libtool, 2001
-#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-#   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.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-# should be set by the caller.
-#
-# The set of defined variables is at the end of this script.
-
-# Known limitations:
-# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
-#   than 256 bytes, otherwise the compiler driver will dump core. The only
-#   known workaround is to choose shorter directory names for the build
-#   directory and/or the installation directory.
-
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-shrext=.so
-
-host="$1"
-host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-# Code taken from libtool.m4's _LT_CC_BASENAME.
-
-for cc_temp in $CC""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-
-# Code taken from libtool.m4's _LT_COMPILER_PIC.
-
-wl=
-if test "$GCC" = yes; then
-  wl='-Wl,'
-else
-  case "$host_os" in
-    aix*)
-      wl='-Wl,'
-      ;;
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      wl='-Wl,'
-      ;;
-    irix5* | irix6* | nonstopux*)
-      wl='-Wl,'
-      ;;
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-        ecc*)
-          wl='-Wl,'
-          ;;
-        icc* | ifort*)
-          wl='-Wl,'
-          ;;
-        lf95*)
-          wl='-Wl,'
-          ;;
-        nagfor*)
-          wl='-Wl,-Wl,,'
-          ;;
-        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-          wl='-Wl,'
-          ;;
-        ccc*)
-          wl='-Wl,'
-          ;;
-        xl* | bgxl* | bgf* | mpixl*)
-          wl='-Wl,'
-          ;;
-        como)
-          wl='-lopt='
-          ;;
-        *)
-          case `$CC -V 2>&1 | sed 5q` in
-            *Sun\ F* | *Sun*Fortran*)
-              wl=
-              ;;
-            *Sun\ C*)
-              wl='-Wl,'
-              ;;
-          esac
-          ;;
-      esac
-      ;;
-    newsos6)
-      ;;
-    *nto* | *qnx*)
-      ;;
-    osf3* | osf4* | osf5*)
-      wl='-Wl,'
-      ;;
-    rdos*)
-      ;;
-    solaris*)
-      case $cc_basename in
-        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-          wl='-Qoption ld '
-          ;;
-        *)
-          wl='-Wl,'
-          ;;
-      esac
-      ;;
-    sunos4*)
-      wl='-Qoption ld '
-      ;;
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      wl='-Wl,'
-      ;;
-    sysv4*MP*)
-      ;;
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      wl='-Wl,'
-      ;;
-    unicos*)
-      wl='-Wl,'
-      ;;
-    uts4*)
-      ;;
-  esac
-fi
-
-# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
-
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-
-case "$host_os" in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # Set some defaults for GNU ld with shared library support. These
-  # are reset later if shared libraries are not supported. Putting them
-  # here allows them to be overridden if necessary.
-  # Unlike libtool, we use -rpath here, not --rpath, since the documented
-  # option of GNU ld is called -rpath, not --rpath.
-  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-  case "$host_os" in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-        ld_shlibs=no
-      fi
-      ;;
-    amigaos*)
-      case "$host_cpu" in
-        powerpc)
-          ;;
-        m68k)
-          hardcode_libdir_flag_spec='-L$libdir'
-          hardcode_minus_L=yes
-          ;;
-      esac
-      ;;
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    cygwin* | mingw* | pw32* | cegcc*)
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    haiku*)
-      ;;
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      ;;
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    netbsd*)
-      ;;
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-        ld_shlibs=no
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-          ld_shlibs=no
-          ;;
-        *)
-          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-          else
-            ld_shlibs=no
-          fi
-          ;;
-      esac
-      ;;
-    sunos4*)
-      hardcode_direct=yes
-      ;;
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-  esac
-  if test "$ld_shlibs" = no; then
-    hardcode_libdir_flag_spec=
-  fi
-else
-  case "$host_os" in
-    aix3*)
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes; then
-        # Neither direct hardcoding nor static linking is supported with a
-        # broken collect2.
-        hardcode_direct=unsupported
-      fi
-      ;;
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-        # On IA64, the linker does run time linking by default, so we don't
-        # have to do anything special.
-        aix_use_runtimelinking=no
-      else
-        aix_use_runtimelinking=no
-        # Test if we are trying to use run time linking or normal
-        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-        # need to do runtime linking.
-        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-          for ld_flag in $LDFLAGS; do
-            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-              aix_use_runtimelinking=yes
-              break
-            fi
-          done
-          ;;
-        esac
-      fi
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      if test "$GCC" = yes; then
-        case $host_os in aix4.[012]|aix4.[012].*)
-          collect2name=`${CC} -print-prog-name=collect2`
-          if test -f "$collect2name" && \
-            strings "$collect2name" | grep resolve_lib_name >/dev/null
-          then
-            # We have reworked collect2
-            :
-          else
-            # We have old collect2
-            hardcode_direct=unsupported
-            hardcode_minus_L=yes
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_libdir_separator=
-          fi
-          ;;
-        esac
-      fi
-      # Begin _LT_AC_SYS_LIBPATH_AIX.
-      echo 'int main () { return 0; }' > conftest.c
-      ${CC} ${LDFLAGS} conftest.c -o conftest
-      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-      if test -z "$aix_libpath"; then
-        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-      fi
-      if test -z "$aix_libpath"; then
-        aix_libpath="/usr/lib:/lib"
-      fi
-      rm -f conftest.c conftest
-      # End _LT_AC_SYS_LIBPATH_AIX.
-      if test "$aix_use_runtimelinking" = yes; then
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-      else
-        if test "$host_cpu" = ia64; then
-          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-        else
-          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        fi
-      fi
-      ;;
-    amigaos*)
-      case "$host_cpu" in
-        powerpc)
-          ;;
-        m68k)
-          hardcode_libdir_flag_spec='-L$libdir'
-          hardcode_minus_L=yes
-          ;;
-      esac
-      ;;
-    bsdi[45]*)
-      ;;
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      libext=lib
-      ;;
-    darwin* | rhapsody*)
-      hardcode_direct=no
-      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    dgux*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    freebsd2.[01]*)
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    freebsd* | dragonfly*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    hpux9*)
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      ;;
-    hpux10*)
-      if test "$with_gnu_ld" = no; then
-        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator=:
-        hardcode_direct=yes
-        # hardcode_minus_L: Not really in the search PATH,
-        # but as the default location of the library.
-        hardcode_minus_L=yes
-      fi
-      ;;
-    hpux11*)
-      if test "$with_gnu_ld" = no; then
-        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator=:
-        case $host_cpu in
-          hppa*64*|ia64*)
-            hardcode_direct=no
-            ;;
-          *)
-            hardcode_direct=yes
-            # hardcode_minus_L: Not really in the search PATH,
-            # but as the default location of the library.
-            hardcode_minus_L=yes
-            ;;
-        esac
-      fi
-      ;;
-    irix5* | irix6* | nonstopux*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    netbsd*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    newsos6)
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    *nto* | *qnx*)
-      ;;
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-        hardcode_direct=yes
-        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-        else
-          case "$host_os" in
-            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-              hardcode_libdir_flag_spec='-R$libdir'
-              ;;
-            *)
-              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-              ;;
-          esac
-        fi
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      ;;
-    osf3*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    osf4* | osf5*)
-      if test "$GCC" = yes; then
-        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-        # Both cc and cxx compiler support -rpath directly
-        hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-    solaris*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      ;;
-    sunos4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    sysv4)
-      case $host_vendor in
-        sni)
-          hardcode_direct=yes # is this really true???
-          ;;
-        siemens)
-          hardcode_direct=no
-          ;;
-        motorola)
-          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-          ;;
-      esac
-      ;;
-    sysv4.3*)
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-        ld_shlibs=yes
-      fi
-      ;;
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      ;;
-    sysv5* | sco3.2v5* | sco5v6*)
-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator=':'
-      ;;
-    uts4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    *)
-      ld_shlibs=no
-      ;;
-  esac
-fi
-
-# Check dynamic linker characteristics
-# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
-# Unlike libtool.m4, here we don't care about _all_ names of the library, but
-# only about the one the linker finds when passed -lNAME. This is the last
-# element of library_names_spec in libtool.m4, or possibly two of them if the
-# linker has special search rules.
-library_names_spec=      # the last element of library_names_spec in libtool.m4
-libname_spec='lib$name'
-case "$host_os" in
-  aix3*)
-    library_names_spec='$libname.a'
-    ;;
-  aix[4-9]*)
-    library_names_spec='$libname$shrext'
-    ;;
-  amigaos*)
-    case "$host_cpu" in
-      powerpc*)
-        library_names_spec='$libname$shrext' ;;
-      m68k)
-        library_names_spec='$libname.a' ;;
-    esac
-    ;;
-  beos*)
-    library_names_spec='$libname$shrext'
-    ;;
-  bsdi[45]*)
-    library_names_spec='$libname$shrext'
-    ;;
-  cygwin* | mingw* | pw32* | cegcc*)
-    shrext=.dll
-    library_names_spec='$libname.dll.a $libname.lib'
-    ;;
-  darwin* | rhapsody*)
-    shrext=.dylib
-    library_names_spec='$libname$shrext'
-    ;;
-  dgux*)
-    library_names_spec='$libname$shrext'
-    ;;
-  freebsd[23].*)
-    library_names_spec='$libname$shrext$versuffix'
-    ;;
-  freebsd* | dragonfly*)
-    library_names_spec='$libname$shrext'
-    ;;
-  gnu*)
-    library_names_spec='$libname$shrext'
-    ;;
-  haiku*)
-    library_names_spec='$libname$shrext'
-    ;;
-  hpux9* | hpux10* | hpux11*)
-    case $host_cpu in
-      ia64*)
-        shrext=.so
-        ;;
-      hppa*64*)
-        shrext=.sl
-        ;;
-      *)
-        shrext=.sl
-        ;;
-    esac
-    library_names_spec='$libname$shrext'
-    ;;
-  interix[3-9]*)
-    library_names_spec='$libname$shrext'
-    ;;
-  irix5* | irix6* | nonstopux*)
-    library_names_spec='$libname$shrext'
-    case "$host_os" in
-      irix5* | nonstopux*)
-        libsuff= shlibsuff=
-        ;;
-      *)
-        case $LD in
-          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
-          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
-          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
-          *) libsuff= shlibsuff= ;;
-        esac
-        ;;
-    esac
-    ;;
-  linux*oldld* | linux*aout* | linux*coff*)
-    ;;
-  linux* | k*bsd*-gnu | kopensolaris*-gnu)
-    library_names_spec='$libname$shrext'
-    ;;
-  knetbsd*-gnu)
-    library_names_spec='$libname$shrext'
-    ;;
-  netbsd*)
-    library_names_spec='$libname$shrext'
-    ;;
-  newsos6)
-    library_names_spec='$libname$shrext'
-    ;;
-  *nto* | *qnx*)
-    library_names_spec='$libname$shrext'
-    ;;
-  openbsd*)
-    library_names_spec='$libname$shrext$versuffix'
-    ;;
-  os2*)
-    libname_spec='$name'
-    shrext=.dll
-    library_names_spec='$libname.a'
-    ;;
-  osf3* | osf4* | osf5*)
-    library_names_spec='$libname$shrext'
-    ;;
-  rdos*)
-    ;;
-  solaris*)
-    library_names_spec='$libname$shrext'
-    ;;
-  sunos4*)
-    library_names_spec='$libname$shrext$versuffix'
-    ;;
-  sysv4 | sysv4.3*)
-    library_names_spec='$libname$shrext'
-    ;;
-  sysv4*MP*)
-    library_names_spec='$libname$shrext'
-    ;;
-  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-    library_names_spec='$libname$shrext'
-    ;;
-  tpf*)
-    library_names_spec='$libname$shrext'
-    ;;
-  uts4*)
-    library_names_spec='$libname$shrext'
-    ;;
-esac
-
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
-shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
-escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-
-LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
-
-# How to pass a linker flag through the compiler.
-wl="$escaped_wl"
-
-# Static library suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally "so").
-shlibext="$shlibext"
-
-# Format of library name prefix.
-libname_spec="$escaped_libname_spec"
-
-# Library names that the linker finds when passed -lNAME.
-library_names_spec="$escaped_library_names_spec"
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator="$hardcode_libdir_separator"
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct="$hardcode_direct"
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L="$hardcode_minus_L"
-
-EOF
diff --git a/config.sub b/config.sub
deleted file mode 100755
index dd2ca93..0000000
--- a/config.sub
+++ /dev/null
@@ -1,1825 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
-
-timestamp='2016-11-04'
-
-# This file 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.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches to <config-patches@gnu.org>.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2016 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-ios)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure b/configure
deleted file mode 100755
index 3c62d90..0000000
--- a/configure
+++ /dev/null
@@ -1,9265 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for simple-scan 3.24.0.
-#
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-as_awk_strverscmp='
-  # Use only awk features that work with 7th edition Unix awk (1978).
-  # My, what an old awk you have, Mr. Solaris!
-  END {
-    while (length(v1) && length(v2)) {
-      # Set d1 to be the next thing to compare from v1, and likewise for d2.
-      # Normally this is a single character, but if v1 and v2 contain digits,
-      # compare them as integers and fractions as strverscmp does.
-      if (v1 ~ /^[0-9]/ && v2 ~ /^[0-9]/) {
-	# Split v1 and v2 into their leading digit string components d1 and d2,
-	# and advance v1 and v2 past the leading digit strings.
-	for (len1 = 1; substr(v1, len1 + 1) ~ /^[0-9]/; len1++) continue
-	for (len2 = 1; substr(v2, len2 + 1) ~ /^[0-9]/; len2++) continue
-	d1 = substr(v1, 1, len1); v1 = substr(v1, len1 + 1)
-	d2 = substr(v2, 1, len2); v2 = substr(v2, len2 + 1)
-	if (d1 ~ /^0/) {
-	  if (d2 ~ /^0/) {
-	    # Compare two fractions.
-	    while (d1 ~ /^0/ && d2 ~ /^0/) {
-	      d1 = substr(d1, 2); len1--
-	      d2 = substr(d2, 2); len2--
-	    }
-	    if (len1 != len2 && ! (len1 && len2 && substr(d1, 1, 1) == substr(d2, 1, 1))) {
-	      # The two components differ in length, and the common prefix
-	      # contains only leading zeros.  Consider the longer to be less.
-	      d1 = -len1
-	      d2 = -len2
-	    } else {
-	      # Otherwise, compare as strings.
-	      d1 = "x" d1
-	      d2 = "x" d2
-	    }
-	  } else {
-	    # A fraction is less than an integer.
-	    exit 1
-	  }
-	} else {
-	  if (d2 ~ /^0/) {
-	    # An integer is greater than a fraction.
-	    exit 2
-	  } else {
-	    # Compare two integers.
-	    d1 += 0
-	    d2 += 0
-	  }
-	}
-      } else {
-	# The normal case, without worrying about digits.
-	d1 = substr(v1, 1, 1); v1 = substr(v1, 2)
-	d2 = substr(v2, 1, 1); v2 = substr(v2, 2)
-      }
-      if (d1 < d2) exit 1
-      if (d1 > d2) exit 2
-    }
-    # Beware Solaris /usr/xgp4/bin/awk (at least through Solaris 10),
-    # which mishandles some comparisons of empty strings to integers.
-    if (length(v2)) exit 1
-    if (length(v1)) exit 2
-  }
-'
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='simple-scan'
-PACKAGE_TARNAME='simple-scan'
-PACKAGE_VERSION='3.24.0'
-PACKAGE_STRING='simple-scan 3.24.0'
-PACKAGE_BUGREPORT=''
-PACKAGE_URL=''
-
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-gt_needs=
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-GETTEXT_PACKAGE
-POSUB
-LTLIBINTL
-LIBINTL
-INTLLIBS
-LTLIBICONV
-LIBICONV
-INTL_MACOSX_LIBS
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-XGETTEXT_EXTRA_OPTIONS
-MSGMERGE
-XGETTEXT_015
-XGETTEXT
-GMSGFMT_015
-MSGFMT_015
-GMSGFMT
-MSGFMT
-GETTEXT_MACRO_VERSION
-USE_NLS
-SED
-YELP_HELP_RULES
-XMLLINT
-ITSTOOL
-HELP_DIR
-YELP_LC_DIST
-YELP_LC_MEDIA_LINKS
-LN_S
-EGREP
-GREP
-CPP
-HAVE_PACKAGEKIT_FALSE
-HAVE_PACKAGEKIT_TRUE
-PACKAGEKIT_LIBS
-PACKAGEKIT_CFLAGS
-HAVE_COLORD_FALSE
-HAVE_COLORD_TRUE
-COLORD_LIBS
-COLORD_CFLAGS
-SIMPLE_SCAN_LIBS
-SIMPLE_SCAN_CFLAGS
-APPSTREAM_XML_RULES
-appstreamxmldir
-APPSTREAM_UTIL
-GLIB_COMPILE_RESOURCES
-GSETTINGS_RULES
-GLIB_COMPILE_SCHEMAS
-gsettingsschemadir
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
-GSETTINGS_DISABLE_SCHEMAS_COMPILE
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-VALAC
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-runstatedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_silent_rules
-enable_maintainer_mode
-enable_dependency_tracking
-enable_schemas_compile
-enable_appstream_util
-enable_colord
-enable_packagekit
-with_help_dir
-enable_nls
-with_gnu_ld
-enable_rpath
-with_libiconv_prefix
-with_libintl_prefix
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
-SIMPLE_SCAN_CFLAGS
-SIMPLE_SCAN_LIBS
-COLORD_CFLAGS
-COLORD_LIBS
-PACKAGEKIT_CFLAGS
-PACKAGEKIT_LIBS
-CPP
-ITSTOOL
-XMLLINT'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures simple-scan 3.24.0 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --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/simple-scan]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.24.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-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-appstream-util
-                          Disable validating AppData XML files during check
-                          phase
-  --enable-colord         Enable colord support[[default=auto]]
-  --enable-packagekit     Enable packagekit support[[default=auto]]
-  --disable-nls           do not use Native Language Support
-  --disable-rpath         do not hardcode runtime library paths
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-help-dir=DIR     path where help files are installed
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
-  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
-  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
-  --without-libintl-prefix     don't search for libintl in includedir and libdir
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  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>
-  PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
-  SIMPLE_SCAN_CFLAGS
-              C compiler flags for SIMPLE_SCAN, overriding pkg-config
-  SIMPLE_SCAN_LIBS
-              linker flags for SIMPLE_SCAN, overriding pkg-config
-  COLORD_CFLAGS
-              C compiler flags for COLORD, overriding pkg-config
-  COLORD_LIBS linker flags for COLORD, overriding pkg-config
-  PACKAGEKIT_CFLAGS
-              C compiler flags for PACKAGEKIT, overriding pkg-config
-  PACKAGEKIT_LIBS
-              linker flags for PACKAGEKIT, overriding pkg-config
-  CPP         C preprocessor
-  ITSTOOL     Path to the `itstool` command
-  XMLLINT     Path to the `xmllint` command
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-simple-scan configure 3.24.0
-generated by GNU Autoconf 2.69
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-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_compile") 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_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-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_cpp conftest.$ac_ext") 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; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # 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
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # 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
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by simple-scan $as_me 3.24.0, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-gt_needs="$gt_needs "
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-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
-
-
-am__api_version='1.15'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-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; }
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
-esac
-
-# 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 (
-   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
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-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.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --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;}
-fi
-
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# 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.
-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.
-set dummy ${ac_tool_prefix}strip; 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_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-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_prog_STRIP="${ac_tool_prefix}strip"
-    $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
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; 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_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-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_prog_ac_ct_STRIP="strip"
-    $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
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-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.
-set dummy $ac_prog; 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_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-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_prog_AWK="$ac_prog"
-    $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
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# 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."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='simple-scan'
- VERSION='3.24.0'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-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 (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-
-# 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 -'
-
-
-
-
-
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-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 :
-  $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
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-
-# 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
-
-  test -z "$ac_cv_path_VALAC" && ac_cv_path_VALAC="valac"
-  ;;
-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 "$VALAC" != valac && test -n "0.22.0"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $VALAC is at least version 0.22.0" >&5
-$as_echo_n "checking whether $VALAC is at least version 0.22.0... " >&6; }
-       am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
-       as_arg_v1=0.22.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_fn_error $? "Vala compiler not found" "$LINENO" 5
-    else
-      :
-    fi
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-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
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; 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_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-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_prog_CC="${ac_tool_prefix}gcc"
-    $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
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; 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_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-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_prog_ac_ct_CC="gcc"
-    $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
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; 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_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-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_prog_CC="${ac_tool_prefix}cc"
-    $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
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; 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_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-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
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $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
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; 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_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-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_prog_CC="$ac_tool_prefix$ac_prog"
-    $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
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; 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_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-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_prog_ac_ct_CC="$ac_prog"
-    $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
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-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_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-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_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-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; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { 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; }
-  if { ac_try='./conftest$ac_cv_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
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-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_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; 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
-
-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 whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-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
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 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"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-
-
-
-  # Check whether --enable-schemas-compile was given.
-if test "${enable_schemas_compile+set}" = set; then :
-  enableval=$enable_schemas_compile; case ${enableval} in
-                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
-                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
-                  *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
-                 esac
-fi
-
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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_ac_pt_PKG_CONFIG="$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
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.16
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-  gsettingsschemadir=${datadir}/glib-2.0/schemas
-
-  if test x$cross_compiling != xyes; then
-    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
-  else
-    # Extract the first word of "glib-compile-schemas", so it can be a program name with args.
-set dummy glib-compile-schemas; 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_SCHEMAS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GLIB_COMPILE_SCHEMAS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # 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_SCHEMAS="$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_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS
-if test -n "$GLIB_COMPILE_SCHEMAS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5
-$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-
-  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
-    as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5
-  else
-    :
-  fi
-
-  GSETTINGS_RULES='
-.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
-
-mostlyclean-am: clean-gsettings-schemas
-
-gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
-
-%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p $(@D) && touch $@
-
-all-am: $(gsettings_SCHEMAS:.xml=.valid)
-uninstall-am: uninstall-gsettings-schemas
-install-data-am: install-gsettings-schemas
-
-.SECONDARY: $(gsettings_SCHEMAS)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
-	@$(NORMAL_INSTALL)
-	if test -n "$^"; then \
-		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
-		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
-		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
-	fi
-
-uninstall-gsettings-schemas:
-	@$(NORMAL_UNINSTALL)
-	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-
-clean-gsettings-schemas:
-	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-ifdef gsettings_ENUM_NAMESPACE
-$(gsettings__enum_file): $(gsettings_ENUM_FILES)
-	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@
-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
-
-
-
-
-
-  # Check whether --enable-appstream-util was given.
-if test "${enable_appstream_util+set}" = set; then :
-  enableval=$enable_appstream_util;
-fi
-
-
-  if test "x$enable_appstream_validate" != "xno"; then :
-  # Extract the first word of "appstream-util", so it can be a program name with args.
-set dummy appstream-util; 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_APPSTREAM_UTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $APPSTREAM_UTIL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_APPSTREAM_UTIL="$APPSTREAM_UTIL" # 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_APPSTREAM_UTIL="$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
-APPSTREAM_UTIL=$ac_cv_path_APPSTREAM_UTIL
-if test -n "$APPSTREAM_UTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPSTREAM_UTIL" >&5
-$as_echo "$APPSTREAM_UTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-         if test "x$APPSTREAM_UTIL" = "x"; then :
-  have_appstream_validate=no
-else
-  have_appstream_validate=yes
-
-fi
-else
-  have_appstream_validate=no
-fi
-
-  if test "x$have_appstream_validate" != "xno"; then :
-  appstream_validate=yes
-else
-  appstream_validate=no
-         if test "x$enable_appstream_validate" = "xyes"; then :
-  as_fn_error $? "AppData validation was requested but appstream-util was not found" "$LINENO" 5
-fi
-fi
-
-  appstreamxmldir=${datadir}/appdata
-
-
-  APPSTREAM_XML_RULES='
-.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml
-
-mostlyclean-am: clean-appstream-xml
-
-%.appdata.valid: %.appdata.xml
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \
-		if test -n "$(APPSTREAM_UTIL)"; \
-			then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \
-		&& touch $@
-
-check-am: $(appstream_XML:.appdata.xml=.appdata.valid)
-uninstall-am: uninstall-appstream-xml
-install-data-am: install-appstream-xml
-
-.SECONDARY: $(appstream_XML)
-
-install-appstream-xml: $(appstream_XML)
-	@$(NORMAL_INSTALL)
-	if test -n "$^"; then \
-		test -z "$(appstreamxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appstreamxmldir)"; \
-		$(INSTALL_DATA) $^ "$(DESTDIR)$(appstreamxmldir)"; \
-	fi
-
-uninstall-appstream-xml:
-	@$(NORMAL_UNINSTALL)
-	@list='\''$(appstream_XML)'\''; test -n "$(appstreamxmldir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '\''$(DESTDIR)$(appstreamxmldir)'\'' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appstreamxmldir)" && rm -f $$files
-
-clean-appstream-xml:
-	rm -f $(appstream_XML:.appdata.xml=.appdata.valid)
-'
-
-
-
-
-
-
-
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIMPLE_SCAN" >&5
-$as_echo_n "checking for SIMPLE_SCAN... " >&6; }
-
-if test -n "$SIMPLE_SCAN_CFLAGS"; then
-    pkg_cv_SIMPLE_SCAN_CFLAGS="$SIMPLE_SCAN_CFLAGS"
- 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
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-    glib-2.0 >= 2.32
-    gtk+-3.0
-    gmodule-export-2.0
-    gthread-2.0
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-") 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
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SIMPLE_SCAN_LIBS"; then
-    pkg_cv_SIMPLE_SCAN_LIBS="$SIMPLE_SCAN_LIBS"
- 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
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-    glib-2.0 >= 2.32
-    gtk+-3.0
-    gmodule-export-2.0
-    gthread-2.0
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-") 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
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-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
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-" 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
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-" 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
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-) were not met:
-
-$SIMPLE_SCAN_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SIMPLE_SCAN_CFLAGS
-and SIMPLE_SCAN_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SIMPLE_SCAN_CFLAGS
-and SIMPLE_SCAN_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	SIMPLE_SCAN_CFLAGS=$pkg_cv_SIMPLE_SCAN_CFLAGS
-	SIMPLE_SCAN_LIBS=$pkg_cv_SIMPLE_SCAN_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-# Check whether --enable-colord was given.
-if test "${enable_colord+set}" = set; then :
-  enableval=$enable_colord; enable_colord=$enableval
-else
-  enable_colord=auto
-fi
-
-have_colord=no
-if test x"$enable_colord" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COLORD" >&5
-$as_echo_n "checking for COLORD... " >&6; }
-
-if test -n "$COLORD_CFLAGS"; then
-    pkg_cv_COLORD_CFLAGS="$COLORD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-        colord
-    \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-        colord
-    ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_COLORD_CFLAGS=`$PKG_CONFIG --cflags "
-        colord
-    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$COLORD_LIBS"; then
-    pkg_cv_COLORD_LIBS="$COLORD_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-        colord
-    \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-        colord
-    ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_COLORD_LIBS=`$PKG_CONFIG --libs "
-        colord
-    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        COLORD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
-        colord
-    " 2>&1`
-        else
-	        COLORD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
-        colord
-    " 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$COLORD_PKG_ERRORS" >&5
-
-	if test x"$enable_colord" = xauto; then
-        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "--enable-colord was given, but could not be found
-See \`config.log' for more details" "$LINENO" 5; }
-     fi
-
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	if test x"$enable_colord" = xauto; then
-        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "--enable-colord was given, but could not be found
-See \`config.log' for more details" "$LINENO" 5; }
-     fi
-
-else
-	COLORD_CFLAGS=$pkg_cv_COLORD_CFLAGS
-	COLORD_LIBS=$pkg_cv_COLORD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_colord=yes
-fi
-fi
- if test $have_colord = yes; then
-  HAVE_COLORD_TRUE=
-  HAVE_COLORD_FALSE='#'
-else
-  HAVE_COLORD_TRUE='#'
-  HAVE_COLORD_FALSE=
-fi
-
-
-# Check whether --enable-packagekit was given.
-if test "${enable_packagekit+set}" = set; then :
-  enableval=$enable_packagekit; enable_packagekit=$enableval
-else
-  enable_packagekit=auto
-fi
-
-have_packagekit=no
-if test x"$enable_packagekit" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PACKAGEKIT" >&5
-$as_echo_n "checking for PACKAGEKIT... " >&6; }
-
-if test -n "$PACKAGEKIT_CFLAGS"; then
-    pkg_cv_PACKAGEKIT_CFLAGS="$PACKAGEKIT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-        packagekit-glib2
-    \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-        packagekit-glib2
-    ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_PACKAGEKIT_CFLAGS=`$PKG_CONFIG --cflags "
-        packagekit-glib2
-    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$PACKAGEKIT_LIBS"; then
-    pkg_cv_PACKAGEKIT_LIBS="$PACKAGEKIT_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
-        packagekit-glib2
-    \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "
-        packagekit-glib2
-    ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_PACKAGEKIT_LIBS=`$PKG_CONFIG --libs "
-        packagekit-glib2
-    " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
-        packagekit-glib2
-    " 2>&1`
-        else
-	        PACKAGEKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
-        packagekit-glib2
-    " 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PACKAGEKIT_PKG_ERRORS" >&5
-
-	if test x"$enable_packagekit" = xauto; then
-        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "--enable-packagekit was given, but could not be found
-See \`config.log' for more details" "$LINENO" 5; }
-     fi
-
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	if test x"$enable_packagekit" = xauto; then
-        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "--enable-packagekit was given, but could not be found
-See \`config.log' for more details" "$LINENO" 5; }
-     fi
-
-else
-	PACKAGEKIT_CFLAGS=$pkg_cv_PACKAGEKIT_CFLAGS
-	PACKAGEKIT_LIBS=$pkg_cv_PACKAGEKIT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_packagekit=yes
-fi
-fi
- if test $have_packagekit = yes; then
-  HAVE_PACKAGEKIT_TRUE=
-  HAVE_PACKAGEKIT_FALSE='#'
-else
-  HAVE_PACKAGEKIT_TRUE='#'
-  HAVE_PACKAGEKIT_FALSE=
-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
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in sane/sane.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default"
-if test "x$ac_cv_header_sane_sane_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SANE_SANE_H 1
-_ACEOF
-
-else
-  as_fn_error $? "SANE not found" "$LINENO" 5
-fi
-
-done
-
-for ac_header in sane/saneopts.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sane/saneopts.h" "ac_cv_header_sane_saneopts_h" "$ac_includes_default"
-if test "x$ac_cv_header_sane_saneopts_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SANE_SANEOPTS_H 1
-_ACEOF
-
-else
-  as_fn_error $? "SANE not found" "$LINENO" 5
-fi
-
-done
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-
-
-
-
-
-
-YELP_LC_MEDIA_LINKS=true
-YELP_LC_DIST=true
-
-for yelpopt in ; do
-  case $yelpopt in
-    lc-media-links)    YELP_LC_MEDIA_LINKS=true ;;
-    no-lc-media-links) YELP_LC_MEDIA_LINKS= ;;
-    lc-dist)           YELP_LC_DIST=true ;;
-    no-lc-dist)        YELP_LC_DIST= ;;
-    *) as_fn_error $? "Unrecognized YELP_HELP_INIT option $yelpopt\"" "$LINENO" 5 ;;
-  esac
-done;
-
-
-
-
-# Check whether --with-help-dir was given.
-if test "${with_help_dir+set}" = set; then :
-  withval=$with_help_dir;
-else
-  with_help_dir='${datadir}/help'
-fi
-
-HELP_DIR="$with_help_dir"
-
-
-
-# Extract the first word of "itstool", so it can be a program name with args.
-set dummy itstool; 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_prog_ITSTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ITSTOOL"; then
-  ac_cv_prog_ITSTOOL="$ITSTOOL" # Let the user override the test.
-else
-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_prog_ITSTOOL="itstool"
-    $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
-
-fi
-fi
-ITSTOOL=$ac_cv_prog_ITSTOOL
-if test -n "$ITSTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ITSTOOL" >&5
-$as_echo "$ITSTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test x"$ITSTOOL" = x; then
-  as_fn_error $? "itstool not found" "$LINENO" 5
-fi
-
-
-# Extract the first word of "xmllint", so it can be a program name with args.
-set dummy xmllint; 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_prog_XMLLINT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$XMLLINT"; then
-  ac_cv_prog_XMLLINT="$XMLLINT" # Let the user override the test.
-else
-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_prog_XMLLINT="xmllint"
-    $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
-
-fi
-fi
-XMLLINT=$ac_cv_prog_XMLLINT
-if test -n "$XMLLINT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
-$as_echo "$XMLLINT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test x"$XMLLINT" = x; then
-  as_fn_error $? "xmllint not found" "$LINENO" 5
-fi
-
-YELP_HELP_RULES='
-HELP_ID ?=
-HELP_POT ?=
-HELP_FILES ?=
-HELP_EXTRA ?=
-HELP_MEDIA ?=
-HELP_LINGUAS ?=
-
-_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS))
-_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot))
-_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po))
-_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES))
-_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f))
-_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f))
-_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f))
-_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f)))
-_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp)
-
-_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
-_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V))
-_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V))
-_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V))
-_HELP_LC_VERBOSE_0 = @echo "  GEN    "$(dir $@);
-
-all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES)
-
-.PHONY: pot
-pot: $(_HELP_POTFILE)
-$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-	$(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
-	$(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
-
-.PHONY: repo
-repo: $(_HELP_POTFILE)
-	$(AM_V_at)for po in $(_HELP_POFILES); do \
-	  if test "x$(_HELP_V)" = "x0"; then echo "  GEN    $${po}"; fi; \
-	  msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \
-	done
-
-$(_HELP_POFILES):
-	$(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi
-	$(AM_V_at)if test ! -f "$@" -a -f "$(srcdir)/$@"; then cp "$(srcdir)/$@" "$@"; fi
-	$(AM_V_GEN)if ! test -f "$@"; then \
-	  (cd "$(dir $@)" && \
-	    $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \
-	    mv "$(notdir $@).tmp" "$(notdir $@)"); \
-	else \
-	  (cd "$(dir $@)" && \
-	    $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \
-	    msgmerge -o "$(notdir $@)" "$(notdir $@)" "$(notdir $@).tmp" && \
-	    rm "$(notdir $@).tmp"); \
-	fi
-
-$(_HELP_MOFILES): %.mo: %.po
-	$(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi
-	$(AM_V_GEN)msgfmt -o "$@" "$<"
-
-$(_HELP_LC_FILES): $(_HELP_LINGUAS)
-$(_HELP_LINGUAS): $(_HELP_LC_STAMPS)
-$(_HELP_LC_STAMPS): %.stamp: %.mo
-$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA)
-	$(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi
-	$(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \
-	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
-	if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \
-	(cd "$(dir $@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \
-	touch "$@"
-
-.PHONY: clean-help
-mostlyclean-am: $(if $(HELP_ID),clean-help)
-clean-help:
-	rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES)
-
-EXTRA_DIST ?=
-EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp))
-EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
-EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
-
-distdir: distdir-help-files
-distdir-help-files: $(_HELP_LC_FILES)
-	@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
-	  $(MKDIR_P) "$(distdir)/$$lc"; \
-	  for file in $(HELP_FILES); do \
-	    if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
-	    cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \
-	  done; \
-	done; \
-
-.PHONY: check-help
-check: check-help
-check-help:
-	for lc in C $(_HELP_LINGUAS); do \
-	  if test -d "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  for page in $(HELP_FILES); do \
-	    echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
-	    $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
-	  done; \
-	done
-
-
-.PHONY: install-help
-install-data-am: $(if $(HELP_ID),install-help)
-install-help: $(_HELP_LC_FILES)
-	@for lc in C $(_HELP_LINGUAS); do \
-	  $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
-	done
-	@for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
-	  if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
-	  echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \
-	  $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \
-	done; done
-	@for f in $(_HELP_C_EXTRA); do \
-	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
-	  if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
-	  echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \
-	  $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \
-	done
-	@for f in $(HELP_MEDIA); do \
-	  for lc in C $(_HELP_LINGUAS); do \
-	    if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \
-	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	    mdir=`dirname "$$f"`; \
-	    if test "x$mdir" = "x."; then mdir=""; fi; \
-	    if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \
-	    if test -f "$$d$$lc/$$f"; then \
-	      echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
-	      $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
-	    elif test "x$$lc" != "xC"; then \
-	      if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
-	        echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
-	        dname="$$f"; \
-	        pars="../"; \
-	        while test "$$dname" != "." -a "$$dname" != "/"; do \
-	          pars="../$$pars"; \
-	          dname=$$(dirname "$$dname"); \
-	        done; \
-	        $(LN_S) -f $$pars"C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
-	      fi; \
-	    fi; \
-	  done; \
-	done
-
-.PHONY: uninstall-help
-uninstall-am: $(if $(HELP_ID),uninstall-help)
-uninstall-help:
-	for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  echo "rm -f $$helpdir`basename $$f`"; \
-	  rm -f "$$helpdir`basename $$f`"; \
-	done; done
-	@for f in $(_HELP_C_EXTRA); do \
-	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  echo "rm -f $$helpdir`basename $$f`"; \
-	  rm -f "$$helpdir`basename $$f`"; \
-	done
-	@for f in $(HELP_MEDIA); do \
-	  for lc in C $(_HELP_LINGUAS); do \
-	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	    echo "rm -f $$helpdir$$f"; \
-	    rm -f "$$helpdir$$f"; \
-	  done; \
-	done;
-'
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_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
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_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 '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "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_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_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_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
-
-
-      GETTEXT_MACRO_VERSION=0.19
-
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; 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_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$MSGFMT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-    ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; 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_GMSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # 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_GMSGFMT="$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_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-    case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; 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_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$XGETTEXT" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-    ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-    rm -f messages.po
-
-    case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; 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_MSGMERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case "$MSGMERGE" in
-  [\\/]* | ?:[\\/]*)
-    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH; do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&5
-          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
-            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-    ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-        test -n "$localedir" || localedir='${datadir}/locale'
-
-
-    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-
-
-  ac_config_commands="$ac_config_commands po-directories"
-
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${acl_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
-      *)
-        test "$with_gnu_ld" != yes && break
-        ;;
-      esac
-    fi
-  done
-  IFS="$acl_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${acl_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-
-                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if ${acl_cv_rpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
-  wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
-    # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath; :
-else
-  enable_rpath=yes
-fi
-
-
-
-
-  acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
-$as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef _LP64
-sixtyfour bits
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
-  gl_cv_solaris_64bit=yes
-else
-  gl_cv_solaris_64bit=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; }
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-        esac
-      fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-
-
-
-
-
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then :
-  withval=$with_libiconv_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
-      fi
-    fi
-
-fi
-
-      LIBICONV=
-  LTLIBICONV=
-  INCICONV=
-  LIBICONV_PREFIX=
-      HAVE_LIBICONV=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='iconv '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$acl_hardcode_direct" = yes; then
-                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
-              else
-                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'iconv'; then
-                  LIBICONV_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'iconv'; then
-                  LIBICONV_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
-                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
-    done
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
-$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <CoreFoundation/CFPreferences.h>
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_CFPreferencesCopyAppValue=yes
-else
-  gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
-
-  fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <CoreFoundation/CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_CFLocaleCopyCurrent=yes
-else
-  gt_cv_func_CFLocaleCopyCurrent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
-
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-
-
-
-
-
-
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-    case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-    if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
-$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval \${$gt_func_gnugettext_libc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-
-int
-main ()
-{
-
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$gt_func_gnugettext_libc=yes"
-else
-  eval "$gt_func_gnugettext_libc=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$gt_func_gnugettext_libc
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-
-
-
-
-
-          am_save_CPPFLAGS="$CPPFLAGS"
-
-  for element in $INCICONV; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <iconv.h>
-
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_func_iconv=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#include <iconv.h>
-
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
-    fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
-  if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
-$as_echo_n "checking for working iconv... " >&6; }
-if ${am_cv_func_iconv_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                  am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      am_cv_func_iconv_works=no
-      for ac_iconv_const in '' 'const'; do
-        if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-             *)            am_cv_func_iconv_works="guessing yes" ;;
-           esac
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <iconv.h>
-#include <string.h>
-
-#ifndef ICONV_CONST
-# define ICONV_CONST $ac_iconv_const
-#endif
-
-int
-main ()
-{
-int result = 0;
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\263";
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
-  return result;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  am_cv_func_iconv_works=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-        test "$am_cv_func_iconv_works" = no || break
-      done
-      LIBS="$am_save_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-$as_echo "$am_cv_func_iconv_works" >&6; }
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
-
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
-  else
-            CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-
-
-
-
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then :
-  withval=$with_libintl_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
-      fi
-    fi
-
-fi
-
-      LIBINTL=
-  LTLIBINTL=
-  INCINTL=
-  LIBINTL_PREFIX=
-      HAVE_LIBINTL=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='intl '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$acl_hardcode_direct" = yes; then
-                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
-              else
-                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
-                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
-    done
-  fi
-
-
-
-
-
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval \${$gt_func_gnugettext_libintl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-
-int
-main ()
-{
-
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$gt_func_gnugettext_libintl=yes"
-else
-  eval "$gt_func_gnugettext_libintl=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-
-int
-main ()
-{
-
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"
-fi
-eval ac_res=\$$gt_func_gnugettext_libintl
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-        fi
-
-                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-                    LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
-$as_echo_n "checking whether to use NLS... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-  if test "$USE_NLS" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
-$as_echo_n "checking where the gettext function comes from... " >&6; }
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-$as_echo "$gt_source" >&6; }
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
-$as_echo_n "checking how to link with libintl... " >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-$as_echo "$LIBINTL" >&6; }
-
-  for element in $INCINTL; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-      fi
-
-
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
-
-$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
-
-    fi
-
-        POSUB=po
-  fi
-
-
-
-    INTLLIBS="$LIBINTL"
-
-
-
-
-
-
-
-GETTEXT_PACKAGE=simple-scan
-
-
-
-ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile help/Makefile po/Makefile.in src/Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# 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=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-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='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_COLORD_TRUE}" && test -z "${HAVE_COLORD_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_COLORD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PACKAGEKIT_TRUE}" && test -z "${HAVE_PACKAGEKIT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PACKAGEKIT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by simple-scan $as_me 3.24.0, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Configuration commands:
-$config_commands
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-simple-scan config.status 3.24.0
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --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)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake < 1.5.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-    "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
-    "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-
-eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # 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
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # 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'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "po-directories":C)
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-
-echo "
-                    Simple Scan $VERSION
-                    ====================
-
-        prefix:                   $prefix
-        PackageKit support:       $have_packagekit
-        Color management:         $have_colord
-"
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index e2b9d94..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,113 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(simple-scan, 3.24.0)
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
-AM_SILENT_RULES([yes])
-AM_MAINTAINER_MODE
-AC_CONFIG_MACRO_DIR([m4])
-
-AM_PROG_VALAC([0.22.0], [], [AC_MSG_ERROR([Vala compiler not found])])
-AM_PROG_CC_C_O
-
-GLIB_GSETTINGS
-AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
-
-APPSTREAM_XML
-
-dnl ###########################################################################
-dnl Dependencies
-dnl ###########################################################################
-
-dnl Run-time dependencies:
-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
-    zlib
-    cairo
-    gdk-pixbuf-2.0
-    gusb
-])
-
-AC_ARG_ENABLE([colord],
-    AS_HELP_STRING([--enable-colord],
-                   [Enable colord support[[default=auto]]]),
-    [enable_colord=$enableval],
-    [enable_colord=auto])
-have_colord=no
-if test x"$enable_colord" != "xno"; then
-    PKG_CHECK_MODULES(COLORD, [
-        colord
-    ],
-    [have_colord=yes],
-    [if test x"$enable_colord" = xauto; then
-        AC_MSG_FAILURE([--enable-colord was given, but could not be found])
-     fi
-    ])
-fi
-AM_CONDITIONAL(HAVE_COLORD, test $have_colord = yes)
-
-AC_ARG_ENABLE([packagekit],
-    AS_HELP_STRING([--enable-packagekit],
-                   [Enable packagekit support[[default=auto]]]),
-    [enable_packagekit=$enableval],
-    [enable_packagekit=auto])
-have_packagekit=no
-if test x"$enable_packagekit" != "xno"; then
-    PKG_CHECK_MODULES(PACKAGEKIT, [
-        packagekit-glib2
-    ],
-    [have_packagekit=yes],
-    [if test x"$enable_packagekit" = xauto; then
-        AC_MSG_FAILURE([--enable-packagekit was given, but could not be found])
-     fi
-    ])
-fi    
-AM_CONDITIONAL(HAVE_PACKAGEKIT, test $have_packagekit = 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])])
-
-dnl ###########################################################################
-dnl Documentation
-dnl ###########################################################################
-
-YELP_HELP_INIT
-
-dnl ###########################################################################
-dnl Internationalization
-dnl ###########################################################################
-
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.7])
-AC_SUBST([GETTEXT_PACKAGE], [simple-scan])
-
-dnl ###########################################################################
-dnl Files to generate
-dnl ###########################################################################
-
-AC_OUTPUT([
-Makefile
-data/Makefile
-data/icons/Makefile
-help/Makefile
-po/Makefile.in
-src/Makefile
-])
-
-dnl ###########################################################################
-dnl Summary
-dnl ###########################################################################
-
-echo "
-                    Simple Scan $VERSION
-                    ====================
-
-        prefix:                   $prefix
-        PackageKit support:       $have_packagekit
-        Color management:         $have_colord
-"
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 7d29429..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-SUBDIRS = icons
-
-desktopdir = $(datadir)/applications
-desktop_in_files = simple-scan.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-# Explicitly list the keywords to stop the icon field being translated
-# https://bugs.launchpad.net/bugs/1624662
-$(desktop_DATA): $(desktop_in_files)
-	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=GenericName --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
-
-gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
-@GSETTINGS_RULES@
-
-appstream_in_files = simple-scan.appdata.xml.in
-appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
-@APPSTREAM_XML_RULES@
-
-$(appstream_XML): $(appstream_in_files)
-	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-
-dist_man1_MANS = simple-scan.1
-
-EXTRA_DIST = $(desktop_in_files)  \
-             $(appstream_in_files) \
-             $(gsettings_SCHEMAS) \
-             simple-scan.ui \
-             simple-scan.gresource.xml
-
-DISTCLEANFILES = \
-	$(desktop_DATA) \
-	$(appstream_XML)
diff --git a/data/Makefile.in b/data/Makefile.in
deleted file mode 100644
index d310329..0000000
--- a/data/Makefile.in
+++ /dev/null
@@ -1,764 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) 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 \
-      *\\[\ \	]*) \
-        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; \
-  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@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = data
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-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 = 
-SOURCES =
-DIST_SOURCES =
-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;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)"
-NROFF = nroff
-MANS = $(dist_man1_MANS)
-DATA = $(desktop_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-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)
-am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPSTREAM_UTIL = @APPSTREAM_UTIL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COLORD_CFLAGS = @COLORD_CFLAGS@
-COLORD_LIBS = @COLORD_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-ITSTOOL = @ITSTOOL@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
-PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMLLINT = @XMLLINT@
-YELP_LC_DIST = @YELP_LC_DIST@
-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-appstreamxmldir = @appstreamxmldir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = icons
-desktopdir = $(datadir)/applications
-desktop_in_files = simple-scan.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
-appstream_in_files = simple-scan.appdata.xml.in
-appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
-dist_man1_MANS = simple-scan.1
-EXTRA_DIST = $(desktop_in_files)  \
-             $(appstream_in_files) \
-             $(gsettings_SCHEMAS) \
-             simple-scan.ui \
-             simple-scan.gresource.xml
-
-DISTCLEANFILES = \
-	$(desktop_DATA) \
-	$(appstream_XML)
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-man1: $(dist_man1_MANS)
-	@$(NORMAL_INSTALL)
-	@list1='$(dist_man1_MANS)'; \
-	list2=''; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@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-desktopDATA: $(desktop_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-	if test -n "$$list"; then \
-	  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)$(desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
-	done
-
-uninstall-desktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(desktopdir)'; $(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.
-$(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//`; \
-	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; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-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
-
-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)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(MANS) $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-desktopDATA install-man
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-desktopDATA uninstall-man
-
-uninstall-man: uninstall-man1
-
-.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-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-man uninstall-man1
-
-.PRECIOUS: Makefile
-
-
-# Explicitly list the keywords to stop the icon field being translated
-# https://bugs.launchpad.net/bugs/1624662
-$(desktop_DATA): $(desktop_in_files)
-	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=GenericName --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
-@GSETTINGS_RULES@
-@APPSTREAM_XML_RULES@
-
-$(appstream_XML): $(appstream_in_files)
-	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/icons/hicolor_actions_16x16_object-crop.png b/data/icons/16x16/object-crop.png
index 48bcd12..48bcd12 100644
--- a/data/icons/hicolor_actions_16x16_object-crop.png
+++ b/data/icons/16x16/object-crop.png
diff --git a/data/icons/hicolor_actions_22x22_object-crop.png b/data/icons/22x22/object-crop.png
index 4dedd93..4dedd93 100644
--- a/data/icons/hicolor_actions_22x22_object-crop.png
+++ b/data/icons/22x22/object-crop.png
diff --git a/data/icons/hicolor_actions_24x24_object-crop.png b/data/icons/24x24/object-crop.png
index 0e46708..0e46708 100644
--- a/data/icons/hicolor_actions_24x24_object-crop.png
+++ b/data/icons/24x24/object-crop.png
diff --git a/data/icons/hicolor_actions_32x32_object-crop.png b/data/icons/32x32/object-crop.png
index b169fb7..b169fb7 100644
--- a/data/icons/hicolor_actions_32x32_object-crop.png
+++ b/data/icons/32x32/object-crop.png
diff --git a/data/icons/hicolor_actions_48x48_object-crop.png b/data/icons/48x48/object-crop.png
index e410183..e410183 100644
--- a/data/icons/hicolor_actions_48x48_object-crop.png
+++ b/data/icons/48x48/object-crop.png
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
deleted file mode 100644
index b098011..0000000
--- a/data/icons/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-icons = \
-	hicolor_actions_16x16_object-crop.png \
-	hicolor_actions_22x22_object-crop.png \
-	hicolor_actions_24x24_object-crop.png \
-	hicolor_actions_32x32_object-crop.png \
-	hicolor_actions_48x48_object-crop.png \
-	hicolor_actions_scalable_object-crop.svg
-
-install-data-local:
-	for icon in $(icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done
-
-uninstall-local:
-	for icon in $(icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done
-
-EXTRA_DIST = $(icons)
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
deleted file mode 100644
index 09ceef4..0000000
--- a/data/icons/Makefile.in
+++ /dev/null
@@ -1,481 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) 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 \
-      *\\[\ \	]*) \
-        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; \
-  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@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = data/icons
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-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 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPSTREAM_UTIL = @APPSTREAM_UTIL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COLORD_CFLAGS = @COLORD_CFLAGS@
-COLORD_LIBS = @COLORD_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-ITSTOOL = @ITSTOOL@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
-PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMLLINT = @XMLLINT@
-YELP_LC_DIST = @YELP_LC_DIST@
-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-appstreamxmldir = @appstreamxmldir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-icons = \
-	hicolor_actions_16x16_object-crop.png \
-	hicolor_actions_22x22_object-crop.png \
-	hicolor_actions_24x24_object-crop.png \
-	hicolor_actions_32x32_object-crop.png \
-	hicolor_actions_48x48_object-crop.png \
-	hicolor_actions_scalable_object-crop.svg
-
-EXTRA_DIST = $(icons)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/icons/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: install-am install-strip
-
-.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 tags-am uninstall uninstall-am uninstall-local
-
-.PRECIOUS: Makefile
-
-
-install-data-local:
-	for icon in $(icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done
-
-uninstall-local:
-	for icon in $(icons); do \
-		THEME=`echo $$icon | cut -d_ -f1`; \
-		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-		SIZE=`echo $$icon | cut -d_ -f3`; \
-		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-		rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/icons/hicolor_actions_scalable_object-crop.svg b/data/icons/scalable/object-crop.svg
index 42c4605..42c4605 100644
--- a/data/icons/hicolor_actions_scalable_object-crop.svg
+++ b/data/icons/scalable/object-crop.svg
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 0000000..cf7401b
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,29 @@
+foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48', 'scalable' ]
+    suffix = 'png'
+    if size == 'scalable'
+        suffix = 'svg'
+    endif
+    install_data (join_paths ('icons', size , 'object-crop.' + suffix),
+                  install_dir: join_paths (icondir, 'hicolor', size, 'actions'))
+endforeach
+
+install_data ('org.gnome.SimpleScan.gschema.xml',
+              install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+meson.add_install_script ('meson_compile_gschema.py')
+
+i18n.merge_file ('desktop-file',
+                 input: 'simple-scan.desktop.in',
+                 output: 'simple-scan.desktop',
+                 install: true,
+                 install_dir: join_paths (datadir, 'applications'),
+                 po_dir: '../po',
+                 type: 'desktop')
+
+i18n.merge_file ('appdata-file',
+                 input: 'simple-scan.appdata.xml.in',
+                 output: 'simple-scan.appdata.xml',
+                 install: true,
+                 install_dir: join_paths (datadir, 'appdata'),
+                 po_dir: '../po')
+
+install_man ('simple-scan.1')
diff --git a/data/meson_compile_gschema.py b/data/meson_compile_gschema.py
new file mode 100755
index 0000000..d0248f4
--- /dev/null
+++ b/data/meson_compile_gschema.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+
+schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
+
+if not os.environ.get('DESTDIR'):
+    print('Compiling gsettings schemas...')
+    subprocess.call(['glib-compile-schemas', schemadir])
diff --git a/data/org.gnome.SimpleScan.gschema.xml b/data/org.gnome.SimpleScan.gschema.xml
index fb38954..f1a0a95 100644
--- a/data/org.gnome.SimpleScan.gschema.xml
+++ b/data/org.gnome.SimpleScan.gschema.xml
@@ -66,5 +66,11 @@
       <summary>Quality value to use for JPEG compression</summary>
       <description>Quality value to use for JPEG compression.</description>
     </key>
+    <key name="page-delay" type="i">
+      <range min="0" max="10000" />
+      <default>1000</default>
+      <summary>Delay in millisecond between pages</summary>
+      <description>Delay in millisecond between pages.</description>
+    </key>
   </schema>
 </schemalist>
diff --git a/data/simple-scan.desktop.in b/data/simple-scan.desktop.in
index 89edeb2..98deb0d 100644
--- a/data/simple-scan.desktop.in
+++ b/data/simple-scan.desktop.in
@@ -2,8 +2,10 @@
 Name=Simple Scan
 GenericName=Document Scanner
 Comment=Scan Documents
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=scan;scanner;flatbed;adf;
 Exec=simple-scan
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=scanner
 Terminal=false
 Type=Application
diff --git a/data/simple-scan.gresource.xml b/data/simple-scan.gresource.xml
deleted file mode 100644
index b6fe6a6..0000000
--- a/data/simple-scan.gresource.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..a62f7b9
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,18 @@
+Hello,
+
+now I use the branching model from Vincent Driessen[1].
+
+I use the gitflow-avh[2]. with the Documentation[3].
+The Debian package can be found here[4].
+
+Please upload unattended uploads use a branch feature/<your title>.
+
+
+Many thanks.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 02 Jun 2017 19:00:40 +0200
+
+[1] http://nvie.com/posts/a-successful-git-branching-model/
+[2] https://github.com/petervanderdoes/gitflow-avh
+[3] https://github.com/petervanderdoes/gitflow-avh/wiki
+[4] https://tracker.debian.org/pkg/git-flow
diff --git a/debian/changelog b/debian/changelog
index af8eb34..cbe80f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,37 @@
-simple-scan (3.24.0-1) UNRELEASED; urgency=medium
+simple-scan (3.26.2-1) unstable; urgency=medium
 
-  * New upstream release:
+  * New upstream release (Closes: #881345):
     - Updated translations.
-  * Refresh debian/patches/0005-zlib.patch.
-
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Tue, 03 Jan 2017 04:33:58 +0100
+    - Check if files exist in multi-file saves.
+    - Remove "Save As" - save now always prompts when overwriting
+      (Closes: #852730).
+    - Add a continuous scan option.
+    - Make email and print actions insensitive when document empty.
+    - Remove .ps and .tiff output support - this is not required.
+    - Switch from autotools to Meson.
+  * New README.source to explain the branching model used.
+  * Switch buildsystem to meson:
+    + debian/control:
+      - Add meson to Build-Depends.
+      - Remove dh-autoreconf from Build-Depends.
+    + debian/rules:
+      - Remove the --with=autoreconf parameter.
+      - Remove override_dh_auto_clean and override_dh_autoreconf section.
+    + debian/simple-scan.install:
+      - Remove useless /usr/bin and /usr/share.
+    + Remove useless debian/patches/0005-zlib.patch.
+  * Declare compliance with Debian Policy 4.1.1. (No changes needed).
+  * Use the automatic debug symbol packages:
+    - Remove simple-scan-dbg section from debian/control.
+    - Remove override_dh_strip from debian/rules.
+  * New Homepage:
+    - debian/watch: switch to gnome.
+  * Change to my new email address.
+  * Drop useless debian/simple-scan.lintian-overrides.
+  * New debian/patches/0010-metadata.patch to install appstream metadata into
+    the requested directory /usr/share/metainfo/.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 12 Nov 2017 13:27:57 +0100
 
 simple-scan (3.23.2-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index baf7021..23377ab 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,10 @@
 Source: simple-scan
 Section: gnome
 Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Standards-Version: 3.9.8
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
+Standards-Version: 4.1.1
 Build-Depends:
  debhelper (>= 10),
- dh-autoreconf,
  gnome-pkg-tools (>= 0.10),
  libcairo2-dev,
  libcolord-dev,
@@ -18,6 +17,7 @@ Build-Depends:
  libsane-dev,
  librsvg2-dev,
  libxml2-utils,
+ meson,
  python-scour,
  valac (>= 0.22),
  yelp-tools,
@@ -41,17 +41,3 @@ Description: Simple Scanning Utility
  Simple Scan is basically a frontend for SANE - which is the same
  backend as XSANE uses. This means that all existing scanners will
  work and the interface is well tested.
-
-Package: simple-scan-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends:
- simple-scan (= ${binary:Version}),
- ${misc:Depends}
-Description: Simple Scanning Utility - debugging symbols
- Simple Scan is an easy-to-use application, designed to let users
- connect their scanner and quickly have the image/document in an
- appropriate format.
- .
- This package provides the debugging symbols for simple-scan.
diff --git a/debian/copyright b/debian/copyright
index 86443a9..84bf9e4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Files: debian/*
 Copyright:
  2009-2012 Alessio Treglia <alessio@debian.org>
  2009      Robert Ancell <robert.ancell@canonical.com>
- 2014-2016 Jörg Frings-Fürst <debian@jff-webhosting.net>
+ 2014-2017 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/patches/0010-metadata.patch b/debian/patches/0010-metadata.patch
new file mode 100644
index 0000000..7277159
--- /dev/null
+++ b/debian/patches/0010-metadata.patch
@@ -0,0 +1,18 @@
+Description: Install metadate into /usr/share/metainfo/
+Author: Jörg Frings-Fürst <debian@jff.email>
+Last-Update: 2017-11-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/data/meson.build
+===================================================================
+--- trunk.orig/data/meson.build
++++ trunk/data/meson.build
+@@ -23,7 +23,7 @@ i18n.merge_file ('appdata-file',
+                  input: 'simple-scan.appdata.xml.in',
+                  output: 'simple-scan.appdata.xml',
+                  install: true,
+-                 install_dir: join_paths (datadir, 'appdata'),
++                 install_dir: join_paths (datadir, 'metainfo'),
+                  po_dir: '../po')
+ 
+ install_man ('simple-scan.1')
diff --git a/debian/patches/series b/debian/patches/series
index 74172d5..82e9ebc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 #0100-typos.patch
-0005-zlib.patch
+#0005-zlib.patch
+0010-metadata.patch
diff --git a/debian/rules b/debian/rules
index 9eec217..0112413 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,29 +20,19 @@
 # - remove gcc-6 comments
 # - remove override_dh_auto_build
 #
+# 2017-07-16 Jörg Frings-Fürst <debian@jff-webhosting.net>
+#
+# - switch to meson
+# - remove override_dh_strip
+#
 
 #
 # Hardening
 #
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-
 %:
-	dh $@ --with=autoreconf,scour
-
-# Autoreconf due to 01_lpi.patch
-override_dh_autoreconf:
-	[ -e gnome-doc-utils.make ] || \
-	ln -s /usr/share/gnome-doc-utils/gnome-doc-utils.make
-	dh_autoreconf
-
-override_dh_auto_clean:
-	dh_auto_clean
-	[ ! -h gnome-doc-utils.make ] || \
-	rm gnome-doc-utils.make
-
-override_dh_strip:
-	dh_strip -psimple-scan --dbg-package=simple-scan-dbg
+	dh $@  --buildsystem=meson --with=scour
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=simple-scan
diff --git a/debian/simple-scan.install b/debian/simple-scan.install
index b7d9a09..63d50cc 100644
--- a/debian/simple-scan.install
+++ b/debian/simple-scan.install
@@ -1,3 +1 @@
 debian/source_simple-scan.py usr/share/apport/package-hooks/
-usr/bin
-usr/share
diff --git a/debian/simple-scan.lintian-overrides b/debian/simple-scan.lintian-overrides
deleted file mode 100644
index bcc578d..0000000
--- a/debian/simple-scan.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Override this false positve error:
-# (See Debian bug #762753)
-#
-privacy-breach-generic
diff --git a/debian/watch b/debian/watch
index 6b24219..81fb209 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=4
-https://launchpad.net/simple-scan/+download .*/simple-scan-([0-9.]+)\.tar\.xz
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
+    @PACKAGE@@ANY_VERSION@\.tar\.xz
diff --git a/depcomp b/depcomp
deleted file mode 100755
index fc98710..0000000
--- a/depcomp
+++ /dev/null
@@ -1,791 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2013-05-30.07; # UTC
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-    exit 1;
-    ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
-  object      Object file output by 'PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-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
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-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
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-  # 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
-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
-fi
-
-if test "$depmode" = xlc; then
-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-  gccflag=-qmakedep=gcc,-MF
-  depmode=gcc
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-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).  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
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # 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.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## 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.
-## 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.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  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
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # 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"
-    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"
-  else
-    make_dummy_depfile
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-xlc)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # 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.
-  set_dir_from "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  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
-  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"
-  ;;
-
-## 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 '\' :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-  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 \'.
-  # Do two passes, one to just change these to
-  # `$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"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # '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.
-  set_dir_from  "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add 'dependent.h:' lines.
-    sed -ne '2,${
-               s/^ *//
-               s/ \\*$//
-               s/$/:/
-               p
-             }' "$tmpdepfile" >> "$depfile"
-  else
-    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.
-  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
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/'"$tab"'/
-  G
-  p
-}' >> "$depfile"
-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for ':'
-  # 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"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$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"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  # 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"
-  # 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
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    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"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-        set fnord "$@"
-        shift
-        shift
-        ;;
-    *)
-        set fnord "$@" "$arg"
-        shift
-        shift
-        ;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/help/C/adf.page b/help/C/adf.page
index 91886ce..6074808 100644
--- a/help/C/adf.page
+++ b/help/C/adf.page
@@ -13,7 +13,6 @@
     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>
diff --git a/help/C/delete.page b/help/C/delete.page
new file mode 100644
index 0000000..ce0dc83
--- /dev/null
+++ b/help/C/delete.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="delete">
+
+    <info>
+        <link type="guide" xref="index#modify"/>
+    </info>
+
+    <title>Deleting a Page</title>
+
+    <steps>
+      <title>Use a Right Click</title>
+      <item><p>Right click on the page you want to delete.</p></item>
+      <item><p>Choose "Delete" from the context menu.</p></item>
+    </steps>
+
+    <steps>
+      <title>Use a Shortcut Key</title>
+      <item><p>Select the page you want to delete (by clicking on it once).</p></item>
+      <item><p>Press the <key>Delete</key> key on the keyboard.</p>
+      </item>
+    </steps>
+
+    <steps>
+      <title>Use a Menu</title>
+      <item><p>Select the page you want to delete (by clicking on it once).</p></item>
+      <item><p>Go to the "Page" menu and click "Delete".</p></item>
+    </steps>
+
+    <note style="warning"><p>WARNING: The deletion of a page cannot be undone!</p></note>
+
+</page>
diff --git a/help/C/external.page b/help/C/external.page
new file mode 100644
index 0000000..34e214e
--- /dev/null
+++ b/help/C/external.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="external">
+
+    <info>
+        <link type="guide" xref="index#use"/>
+    </info>
+  
+    <title>Externally View a Page</title>
+
+    <p>
+    Double click a scanned page to view it with your default image viewer. This action
+    creates a TIFF file containing the raw data from the scanner in your /tmp directory
+    named "<em>scanned-pageXXXXXX.tiff</em>".
+    </p>
+    <p>
+    If you double click the scanned page after crop is enabled, only the cropped part will open.
+    You can, therefore, use this feature to check more accurately whether you have
+    positioned the crop frame exactly where you wanted it.    
+    </p>
+    
+</page>
diff --git a/help/C/index.page b/help/C/index.page
index c9d8425..9ddb34f 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -27,8 +27,4 @@
     <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/quality.page b/help/C/quality.page
index 1075783..53e8d45 100644
--- a/help/C/quality.page
+++ b/help/C/quality.page
@@ -9,7 +9,7 @@
 	<title>Setting the Image Quality</title>
 
     <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the save dialog.
     Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
     A high quality will keep all the scanned information but require a larger file size.
     See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
diff --git a/help/Makefile.am b/help/Makefile.am
deleted file mode 100644
index 002fe95..0000000
--- a/help/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-@YELP_HELP_RULES@
-
-HELP_ID = simple-scan
-HELP_POT = simple-scan-help.pot
-
-HELP_MEDIA = \
-             figures/icon.png		\
-             figures/preferences.png	\
-             figures/scan_toolbar.png
-
-HELP_FILES = index.page \
-             adf.page \
-             brightness-contrast.page \
-             crop.page \
-             dpi.page \
-             email.page \
-             legal.xml \
-             print.page \
-             quality.page \
-             reorder.page \
-             rotate.page \
-             save.page \
-             scanner.page \
-             scanning.page
-
-HELP_LINGUAS = ar bg cs de en_GB es eu fi fr hr hu ia it ja ku nb nl pl pt_BR ru sk sl sr uk zh_TW
diff --git a/help/Makefile.in b/help/Makefile.in
deleted file mode 100644
index 4b6567f..0000000
--- a/help/Makefile.in
+++ /dev/null
@@ -1,477 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) 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 \
-      *\\[\ \	]*) \
-        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; \
-  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@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = help
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-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 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPSTREAM_UTIL = @APPSTREAM_UTIL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COLORD_CFLAGS = @COLORD_CFLAGS@
-COLORD_LIBS = @COLORD_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-ITSTOOL = @ITSTOOL@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
-PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMLLINT = @XMLLINT@
-YELP_LC_DIST = @YELP_LC_DIST@
-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-appstreamxmldir = @appstreamxmldir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-HELP_ID = simple-scan
-HELP_POT = simple-scan-help.pot
-HELP_MEDIA = \
-             figures/icon.png		\
-             figures/preferences.png	\
-             figures/scan_toolbar.png
-
-HELP_FILES = index.page \
-             adf.page \
-             brightness-contrast.page \
-             crop.page \
-             dpi.page \
-             email.page \
-             legal.xml \
-             print.page \
-             quality.page \
-             reorder.page \
-             rotate.page \
-             save.page \
-             scanner.page \
-             scanning.page
-
-HELP_LINGUAS = ar bg cs de en_GB es eu fi fr hr hu ia it ja ku nb nl pl pt_BR ru sk sl sr uk zh_TW
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign help/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign help/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.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
-
-.PRECIOUS: Makefile
-
-@YELP_HELP_RULES@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/help/ar/adf.page b/help/ar/adf.page
deleted file mode 100644
index 72b9e10..0000000
--- a/help/ar/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>استخدام مغذّي المستندات الآلي</title>
-
-    <p>
-    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 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/ar/ar.po b/help/ar/ar.po
index 4d45b17..2bbe6ea 100644
--- a/help/ar/ar.po
+++ b/help/ar/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2012-09-30 20:27+0000\n"
 "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Ibrahim Saed https://launchpad.net/~ibraheem5000"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "روبرت أنسل"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "مسح الصفحات"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "تعديل المستند"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "استخدام المستند"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -363,6 +317,52 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr "انظر <link xref=\"save\"/> لمزيد من المعلومات حول صيغ الملفات."
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "روبرت أنسل"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "مسح الصفحات"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "تعديل المستند"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "استخدام المستند"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/ar/ar.stamp b/help/ar/ar.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/ar/ar.stamp
+++ /dev/null
diff --git a/help/ar/brightness-contrast.page b/help/ar/brightness-contrast.page
deleted file mode 100644
index 0d2cb5a..0000000
--- a/help/ar/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/ar/crop.page b/help/ar/crop.page
deleted file mode 100644
index 48b1292..0000000
--- a/help/ar/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>الاقتصاص</title>
-
-    <p>
-    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/ar/dpi.page b/help/ar/dpi.page
deleted file mode 100644
index 2c0d13f..0000000
--- a/help/ar/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>إعداد ميز المسح</title>
-
-    <p>
-    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/ar/email.page b/help/ar/email.page
deleted file mode 100644
index 2a6427c..0000000
--- a/help/ar/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>الإرسال بالبريد الإلكتروني</title>
-
-    <p>لإرسال المستند الحالي بالبريد الإلكتروني استخدم قائمة <guiseq><gui>مستند</gui><gui>بريد إلكتروني</gui></guiseq> (<keyseq><key>Ctrl</key><key>E</key></keyseq>). سيُفتح برنامج البريد الإلكتروني مع رسالة جديدة تحتوي المستند الممسوح كمُرفق.</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>انظر <link xref="save"/> لمزيد من المعلومات حول صيغ الملفات.</p>
-</page>
diff --git a/help/ar/index.page b/help/ar/index.page
deleted file mode 100644
index d774dfe..0000000
--- a/help/ar/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="ar">
-
-	<info>
-		<credit type="author">
-			<name>روبرت أنسل</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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>مسح الصفحات</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>تعديل المستند</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>استخدام المستند</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/ar/legal.xml b/help/ar/legal.xml
deleted file mode 100644
index a288251..0000000
--- a/help/ar/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>هذا العمل مُرخص تحت <link href="http://creativecommons.org/licenses/by-sa/3.0/">رخصة المشاع الإبداعي: النسبة-الترخيص بالمثل 3.0</link>.</p>
-<p>كاستثناء خاص، فإن أصحاب حقوق النسح يعطونك الإذن بنسخ وتعديل وتوزيع نموذج الكود الوارد في هذا المستند تحت البنود التي تختارها، بدون قيود.</p>
-</license>
diff --git a/help/ar/print.page b/help/ar/print.page
deleted file mode 100644
index 7e5c6b4..0000000
--- a/help/ar/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>الطباعة</title>
-
-    <p>
-    <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/ar/quality.page b/help/ar/quality.page
deleted file mode 100644
index 9cdbf9f..0000000
--- a/help/ar/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/ar/reorder.page b/help/ar/reorder.page
deleted file mode 100644
index bce2460..0000000
--- a/help/ar/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>إعادة ترتيب الصفحات</title>
-
-    <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>
-    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/ar/rotate.page b/help/ar/rotate.page
deleted file mode 100644
index 06e52fe..0000000
--- a/help/ar/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/ar/save.page b/help/ar/save.page
deleted file mode 100644
index 50c5963..0000000
--- a/help/ar/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>الحفظ إلى ملف</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/ar/scanner.page b/help/ar/scanner.page
deleted file mode 100644
index b2a42c2..0000000
--- a/help/ar/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="ar">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>اختيار ماسحة ضوئية</title>
-
-    <p>
-    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 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/ar/scanning.page b/help/ar/scanning.page
deleted file mode 100644
index 80e1960..0000000
--- a/help/ar/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="ar">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>مسح صفحة</title>
-
-    <p>لمسح مستند في الماسحة الضوئية:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>افتح <app>الماسحة الضوئية</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>
-
-    <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>
-      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/bg/adf.page b/help/bg/adf.page
deleted file mode 100644
index 74dceed..0000000
--- a/help/bg/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Използване на Автоматично Листоподаващо Устройство</title>
-
-    <p>
-    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 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/bg/bg.po b/help/bg/bg.po
index 26497e6..ea46f70 100644
--- a/help/bg/bg.po
+++ b/help/bg/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2012-12-01 09:03+0000\n"
 "Last-Translator: Blagovest Petrov <blagovest@petrovs.info>\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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Blagovest Petrov https://launchpad.net/~eniac-bg"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Сканиране на страници"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Промяна на документ"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Използване на документ"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -365,6 +319,52 @@ msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 "Вижте <link xref=\"save\"/> за повече информация относно файловите формати."
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Сканиране на страници"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Промяна на документ"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Използване на документ"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/bg/bg.stamp b/help/bg/bg.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/bg/bg.stamp
+++ /dev/null
diff --git a/help/bg/brightness-contrast.page b/help/bg/brightness-contrast.page
deleted file mode 100644
index 672d4fb..0000000
--- a/help/bg/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/bg/crop.page b/help/bg/crop.page
deleted file mode 100644
index 777b85d..0000000
--- a/help/bg/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Отрязване</title>
-
-    <p>
-    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/bg/dpi.page b/help/bg/dpi.page
deleted file mode 100644
index efd6f2b..0000000
--- a/help/bg/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Определяне на резолюцията за сканиране</title>
-
-    <p>
-    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/bg/email.page b/help/bg/email.page
deleted file mode 100644
index daf1829..0000000
--- a/help/bg/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Изпращане чрез имейл</title>
-
-    <p>За да изпратите текущия документ по електронна поща, използвайте менюто <guiseq><gui>Документ</gui><gui>Електронна поща</gui></guiseq> (<keyseq><key>Ctrl</key><key>Е</key></keyseq>). Вашата програма за електронна поща ще бъде отворена със заредено ново съобщение, съдържащо сканирания документ като прикрепен файл.</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>Вижте <link xref="save"/> за повече информация относно файловите формати.</p>
-</page>
diff --git a/help/bg/index.page b/help/bg/index.page
deleted file mode 100644
index ed1086a..0000000
--- a/help/bg/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="bg">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Сканиране на страници</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Промяна на документ</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Използване на документ</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/bg/legal.xml b/help/bg/legal.xml
deleted file mode 100644
index df0c34e..0000000
--- a/help/bg/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Тази разработка е лицензирана под <link href="http://creativecommons.org/licenses/by-sa/3.0/">Признание-Споделяне на споделеното 3.0 Нелокализиран</link>.</p>
-<p>Като специално изключение, правоносителите Ви дават разрешение да копирате, променяте и разпространявате примерния код, съдържащ се в този документ под условия, които Вие изберете, без забрани.</p>
-</license>
diff --git a/help/bg/print.page b/help/bg/print.page
deleted file mode 100644
index d2c703f..0000000
--- a/help/bg/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Отпечатване</title>
-
-    <p>
-    <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/bg/quality.page b/help/bg/quality.page
deleted file mode 100644
index 70780f0..0000000
--- a/help/bg/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/bg/reorder.page b/help/bg/reorder.page
deleted file mode 100644
index 09acc02..0000000
--- a/help/bg/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Преподреждане на страници</title>
-
-    <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>
-    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/bg/rotate.page b/help/bg/rotate.page
deleted file mode 100644
index 432e0e1..0000000
--- a/help/bg/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/bg/save.page b/help/bg/save.page
deleted file mode 100644
index 98926f2..0000000
--- a/help/bg/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Записване във файл</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/bg/scanner.page b/help/bg/scanner.page
deleted file mode 100644
index 18363e4..0000000
--- a/help/bg/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="bg">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Избиране на скенер</title>
-
-    <p>
-    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 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/bg/scanning.page b/help/bg/scanning.page
deleted file mode 100644
index 055a0e7..0000000
--- a/help/bg/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="bg">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Сканиране на страница</title>
-
-    <p>За сканиране на документ от вашия скенер</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Отваряне на <app>Опростено сканиране</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>
-
-    <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>
-      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/cs/adf.page b/help/cs/adf.page
deleted file mode 100644
index 886aa68..0000000
--- a/help/cs/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Použití automatického podavače dokumentů</title>
-
-    <p>
-    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 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/cs/brightness-contrast.page b/help/cs/brightness-contrast.page
deleted file mode 100644
index 19be070..0000000
--- a/help/cs/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/cs/crop.page b/help/cs/crop.page
deleted file mode 100644
index e3981a5..0000000
--- a/help/cs/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Ořezávání</title>
-
-    <p>
-    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/cs/cs.po b/help/cs/cs.po
index cf692bf..f9927ad 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -1,81 +1,29 @@
-# Czech 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.
+#
+# Marek Černocký <marek@manet.cz>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2013-12-18 17:17+0000\n"
-"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
-"Language-Team: Czech <cs@li.org>\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-09 00:25+0200\n"
+"Last-Translator: Marek Černocký <marek@manet.cz>\n"
+"Language-Team: čeština <gnome-cs-list@gnome.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Dominik Bednář https://launchpad.net/~b-f-hero\n"
-"  Ondra Kadlec https://launchpad.net/~o-kadlec\n"
-"  Tadeáš Pařík https://launchpad.net/~pariktadeas"
-
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Skenování stránek"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Úprava dokumentu"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Využití dokumentu"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
+msgstr "Marek Černocký <marek@manet.cz>"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
-msgstr "Použití automatického podavače dokumentů"
+msgstr "Používání automatického podavače"
 
 #. (itstool) path: page/p
 #: C/adf.page:11
@@ -83,23 +31,24 @@ msgid ""
 "If your scanner features an Automatic Document Feeder (ADF) you can scan all "
 "the pages from the feeder via one of following methods:"
 msgstr ""
+"V případě, že má váš skener automatický podavač (ADF – Automatic Document "
+"Feeder), můžete naskenovat všechny listy vložené v podavači naráz jedním z "
+"následujících postupů:"
 
 #. (itstool) path: steps/title
 #: C/adf.page:17
 msgid "Use a Keyboard Shortcut"
-msgstr ""
+msgstr "Použití klávesové zkratky"
 
 #. (itstool) path: item/p
 #: C/adf.page:19
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr ""
+msgstr "Zmáčkněte <keyseq><key>Ctrl</key><key>F</key></keyseq>"
 
 #. (itstool) path: steps/title
-#: C/adf.page:24
-#: C/crop.page:27
-#: C/rotate.page:28
+#: C/adf.page:24 C/crop.page:27 C/rotate.page:28
 msgid "Use a Menu"
-msgstr ""
+msgstr "Použití nabídky"
 
 #. (itstool) path: item/p
 #: C/adf.page:26
@@ -107,34 +56,37 @@ msgid ""
 "Navigate to <guiseq><gui>Document</gui> <gui>Scan</gui><gui>All Pages From "
 "Feeder</gui></guiseq>."
 msgstr ""
+"Přejděte na <guiseq><gui>Dokument</gui><gui>Skenovat</gui><gui>Všechny "
+"stránky z podavače</gui></guiseq>."
 
 #. (itstool) path: steps/title
 #: C/adf.page:33
 msgid "Use the Toolbar Buttons"
-msgstr ""
+msgstr "Použití tlačítek z nástrojové lišty"
 
 #. (itstool) path: item/p
 #: C/adf.page:35
 msgid "Click on the arrow to the right of the \"Scan\" button."
-msgstr ""
+msgstr "Klikněte na šipku vedle tlačítka <gui>Skenovat</gui>."
 
 #. (itstool) path: item/p
 #: C/adf.page:38
 msgid "Choose \"All Pages From Feeder\"."
-msgstr ""
+msgstr "Zvolte „Všechny stránky z podavače“."
 
 #. (itstool) path: item/media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:39
-#: C/scanning.page:20
+#: C/adf.page:39 C/scanning.page:20
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
 "md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 msgstr ""
+"external ref='figures/scan_toolbar.png' "
+"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 
 #. (itstool) path: note/p
 #: C/adf.page:45
@@ -143,6 +95,9 @@ msgid ""
 "capability. You can choose single side scanning from the "
 "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Standardně se při použití této funkce naskenují obě strany listu. Skenování "
+"jen jedné strany můžete navolit v nabídce <guiseq><gui>Dokument</"
+"gui><gui>Předvolby</gui></guiseq>."
 
 #. (itstool) path: note/media
 #. (itstool) path: page/media
@@ -150,18 +105,17 @@ msgstr ""
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:49
-#: C/dpi.page:16
-#: C/scanner.page:14
+#: C/adf.page:49 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
 msgid ""
 "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
 msgstr ""
+"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
 msgid "Setting brightness and Contrast"
-msgstr ""
+msgstr "Nastavení jasu a kontrastu"
 
 #. (itstool) path: page/p
 #: C/brightness-contrast.page:11
@@ -171,6 +125,10 @@ msgid ""
 "settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> "
 "menu."
 msgstr ""
+"Některé skenery umožňují během skenování přizpůsobit jas a kontrast. Pokud "
+"jsou naskenované stránky příliš tmavé nebo příliš světlé, můžete si upravit "
+"nastavení přes nabídku <guiseq><gui>Dokument</gui><gui>Předvolby</gui></"
+"guiseq>."
 
 #. (itstool) path: page/title
 #: C/crop.page:9
@@ -187,16 +145,23 @@ msgid ""
 "used shown in gray. You can enable crop and choose the desired dimensions "
 "via one of the following methods:"
 msgstr ""
+"Funkce ořezávání v <app>Jednoduchém skenování</app> umožňuje použít jen část "
+"naskenovaného obrázku. Ořezání můžete zapnout buď před nebo po naskenování "
+"stránky a vždy můžete změnit rozměry ořezového rámu. Když je ořezávání "
+"zapnuté, objeví se přes aktuální stránku maska, díky které je část, která se "
+"zahodí, zašedlá. Zapnout ořezávání a nastavit požadované rozměry můžete "
+"následujícími způsoby:"
 
 #. (itstool) path: steps/title
 #: C/crop.page:19
 msgid "Use a Right Click"
-msgstr ""
+msgstr "Použití pravého tlačítka"
 
 #. (itstool) path: item/p
 #: C/crop.page:20
 msgid "Right click anywhere on the image area and select \"Crop\"."
 msgstr ""
+"Klikněte pravým tlačítkem kdekoliv v oblasti obrázku a vyberte „Oříznout“."
 
 #. (itstool) path: item/p
 #: C/crop.page:21
@@ -204,17 +169,20 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually set "
 "the crop frame's dimensions by dragging its borders."
 msgstr ""
+"Zvolte jeden z pevně daných ořezových rámů, nebo vyberte „Vlastní“ a "
+"nastavte si jeho rozměry ručně tažením jeho okrajů."
 
 #. (itstool) path: item/p
-#: C/crop.page:23
-#: C/crop.page:30
+#: C/crop.page:23 C/crop.page:30
 msgid "Click and hold the frame, then move it to the desired position."
 msgstr ""
+"Klikněte na rám, zůstaňte tlačítko držet a přesuňte rám na požadované místo."
 
 #. (itstool) path: item/p
 #: C/crop.page:28
 msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
 msgstr ""
+"Přejděte do nabídky <guiseq><gui>Stránka</gui><gui>Oříznout</gui></guiseq>."
 
 #. (itstool) path: item/p
 #: C/crop.page:29
@@ -222,16 +190,18 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually adjust "
 "the frame's dimensions by dragging its borders."
 msgstr ""
+"Zvolte jeden z pevně daných ořezových rámů, nebo vyberte „Vlastní“ a "
+"přizpůsobte si jeho rozměry ručně tažením jeho okrajů."
 
 #. (itstool) path: steps/title
 #: C/crop.page:34
 msgid "Use the Toolbar"
-msgstr ""
+msgstr "Použití nástrojové lišty"
 
 #. (itstool) path: item/p
 #: C/crop.page:35
 msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
-msgstr ""
+msgstr "Klikněte na tlačítko <gui>Oříznout</gui> na nástrojové liště."
 
 #. (itstool) path: note/p
 #: C/crop.page:36
@@ -239,31 +209,38 @@ msgid ""
 "This is the same as choosing \"Custom\" in step 2 of the aforementioned "
 "methods."
 msgstr ""
+"Je to to stejné, jako když u shora zmíněných metod zvolíte v kroku 2 "
+"„Vlastní“."
 
 #. (itstool) path: item/p
 #: C/crop.page:38
 msgid ""
 "Drag the borders of the frame to set the desired dimensions and position."
 msgstr ""
+"Přetáhněte okraje rámu tak, abyste dosáhli požadovaných rozměrů a umístění."
 
 #. (itstool) path: note/p
 #: C/crop.page:42
 msgid "Each new scanned page will use the previous crop."
-msgstr ""
+msgstr "Nově naskenované stránky vždy použijí předchozí ořezání."
 
 #. (itstool) path: page/title
 #: C/dpi.page:9
 msgid "Setting the Scan Resolution"
-msgstr "Nastavení rozlišení"
+msgstr "Nastavení rozlišení skeneru"
 
 #. (itstool) path: page/p
 #: C/dpi.page:11
 msgid ""
 "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."
+"You can change these settings from the <guiseq><gui>Document</"
+"gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Výchozí rozlišení pro dokument typu <gui><em>Text</em></gui> je 150 dpi "
+"(bodů na palec) a pro dokument typu <gui><em>Fotografie</em></gui> 300 dpi. "
+"Toto nastavení můžete změnit přes nabídku <guiseq><gui>Dokument</"
+"gui><gui>Předvolby</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/dpi.page:18
@@ -271,60 +248,58 @@ msgid ""
 "The available scanning resolutions for both document types (Text and Photo) "
 "are the same and are listed in the following table:"
 msgstr ""
+"Dostupná rozlišení skenování pro oba typy dokumentů (text a fotografie) jsou "
+"stejná a jsou uvedená v následující tabulce:"
 
 #. (itstool) path: td/p
 #: C/dpi.page:23
 msgid "<em>Text Resolution</em>"
-msgstr ""
+msgstr "<em>Rozlišení textu</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:24
 msgid "<em>Photo Resolution</em>"
-msgstr ""
+msgstr "<em>Rozlišení fotografie</em>"
 
 #. (itstool) path: td/p
-#: C/dpi.page:27
-#: C/dpi.page:28
+#: C/dpi.page:27 C/dpi.page:28
 msgid "75 dpi (draft)"
-msgstr ""
+msgstr "75 dpi (náčrt)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:31
 msgid "150 dpi (default)"
-msgstr ""
+msgstr "150 dpi (výchozí)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:32
 msgid "150 dpi"
-msgstr ""
+msgstr "150 dpi"
 
 #. (itstool) path: td/p
 #: C/dpi.page:35
 msgid "300 dpi"
-msgstr ""
+msgstr "300 dpi"
 
 #. (itstool) path: td/p
 #: C/dpi.page:36
 msgid "300 dpi (default)"
-msgstr ""
+msgstr "300 dpi (výchozí)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:39
-#: C/dpi.page:40
+#: C/dpi.page:39 C/dpi.page:40
 msgid "600 dpi"
-msgstr ""
+msgstr "600 dpi"
 
 #. (itstool) path: td/p
-#: C/dpi.page:43
-#: C/dpi.page:44
+#: C/dpi.page:43 C/dpi.page:44
 msgid "1200 dpi (high resolution)"
-msgstr ""
+msgstr "1200 dpi (vysoké rozlišení)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:47
-#: C/dpi.page:48
+#: C/dpi.page:47 C/dpi.page:48
 msgid "2400 dpi"
-msgstr ""
+msgstr "2400 dpi"
 
 #. (itstool) path: note/p
 #: C/dpi.page:52
@@ -333,48 +308,95 @@ msgid ""
 "while <gui><em>Photo</em></gui> documents are always scanned in color, at "
 "any resolution!"
 msgstr ""
+"Dokumenty typu <gui><em>Text</em></gui> jsou vždy skenované v odstínech "
+"šedé, zatímco dokumenty typu <gui><em>Fotografie</em></gui> jsou vždy "
+"skenované v barvách. To platí pro kterékoliv rozlišení."
 
 #. (itstool) path: page/title
 #: C/email.page:9
 msgid "Sending via Email"
-msgstr "Odeslání emailem"
+msgstr "Odeslání přes e-mail"
 
 #. (itstool) path: page/p
 #: C/email.page:11
 msgid ""
-"To email the current document use the "
-"<guiseq><gui>Document</gui><gui>Email</gui></guiseq> menu "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be "
-"opened with a new message containing the scanned document as an attachment."
+"To email the current document use the <guiseq><gui>Document</gui><gui>Email</"
+"gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your "
+"email program will be opened with a new message containing the scanned "
+"document as an attachment."
 msgstr ""
-"Pro odeslání stávajícího dokumentu emailem použijte nabídku "
-"<guiseq><gui>Dokument</gui><gui>E-mail</gui></guiseq> "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Emailový program otevře "
-"novou zprávu s naskenovaným dokumentem v příloze."
+"Pro odeslání aktuálního dokumentu e-mailem použijte nabídku "
+"<guiseq><gui>Dokument</gui><gui>E-mail</gui></guiseq> (<keyseq><key>Ctrl</"
+"key><key>E</key></keyseq>). Otevře se poštovní program s novou zprávou, "
+"která bude obsahovat naskenovaný dokument jako přílohu."
 
 #. (itstool) path: page/p
 #: C/email.page:16
 msgid ""
 "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."
+"attachment for each page. Conversely, if the document type was set to \"Photo"
+"\", the email will have a JPEG attachment for each page."
 msgstr ""
+"Pokud byl typ dokumentu nastaven na „Text“, bude mít e-mail jednu přílohu "
+"PDF pro všechny stránky. Naopak, pokud byl typ dokumentu nastaven na "
+"„Fotografie“, bude mít e-mail jednotlivé přílohy JPEG pro každou ze stránek."
 
 #. (itstool) path: page/p
 #: C/email.page:21
 msgid "See <link xref=\"save\"/> for more information about file formats."
+msgstr "Více o souborových formátech viz <link xref=\"save\"/>."
+
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
 msgstr ""
-"Pro více informací o souborových formátech navštivte <link xref=\"save\"/>."
+"<media type=\"image\" src=\"figures/icon.png\"/> Příručka k Jednoduchému "
+"skenování"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Skenování stránek"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Úpravy dokumentu"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Používání dokumentu"
 
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
-msgstr "Licence Creative Commons Attribution-Share Alike 3.0 Unported"
+msgstr "Creative Commons Attribution-Share Alike 3.0 Unported License"
 
 #. (itstool) path: license/p
 #: C/legal.xml:3
 msgid "This work is licensed under a <_:link-1/>."
-msgstr "Tato práce je zveřejněna pod licencí <_:link-1/>."
+msgstr "Toto dílo je licencováno pod <_:link-1/>."
 
 #. (itstool) path: license/p
 #: C/legal.xml:6
@@ -383,9 +405,9 @@ msgid ""
 "modify, and distribute the example code contained in this document under the "
 "terms of your choosing, without restriction."
 msgstr ""
-"Držitelé práv udělují zvláštní výjimku ke kopírování, úpravě a distribuci "
-"vzorového kódu obsaženého v tomto dokumentu za podmínek, které si vyberete. "
-"Bez omezení."
+"Jako zvláštní výjimka se vám držitelem autorských práv uděluje svolení "
+"kopírovat, upravovat a šířit ukázkový kód obsažený v tomto dokumentu za "
+"podmínek, které si sami zvolíte, bez dalších omezení."
 
 #. (itstool) path: page/title
 #: C/print.page:9
@@ -400,11 +422,15 @@ msgid ""
 "<app>Simple Scan</app> a very convenient tool for making copies of documents "
 "or photos."
 msgstr ""
+"<app>Jednoduché skenování</app> vám umožňuje tisk naskenovaného dokumentu "
+"přímo ze svého rozhraní, aniž byste museli dokument nejprve uložit. To dělá "
+"z <app>Jednoduchého skenování</app> nástroj vhodný pro kopírování dokumentů "
+"a fotografií."
 
 #. (itstool) path: steps/title
 #: C/print.page:17
 msgid "To Print a Document"
-msgstr ""
+msgstr "Když chcete vytisknout dokument"
 
 #. (itstool) path: item/p
 #: C/print.page:19
@@ -413,6 +439,9 @@ msgid ""
 "the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>. This "
 "will open the \"Print\" dialog box."
 msgstr ""
+"Přejděte do nabídky <guiseq><gui>Dokument</gui><gui>Tisk</gui></guiseq> nebo "
+"použijte klávesovou zkratku <keyseq><key>Ctrl</key><key>P</key></keyseq>. "
+"Tím se otevře dialogové okno „Tisk“."
 
 #. (itstool) path: item/p
 #: C/print.page:25
@@ -420,29 +449,37 @@ msgid ""
 "From the \"Print\" dialog box choose your desired printing settings and/or "
 "Print Preview the document, then press the \"Print\" button."
 msgstr ""
+"V dialogovém okně „Tisk“ vyberte požadované nastavení tisku, případně se "
+"podívejte na náhled tisku, a pak zmáčkněte tlačítko <gui>Tisk</gui>."
 
 #. (itstool) path: page/title
 #: C/quality.page:9
 msgid "Setting the Image Quality"
-msgstr ""
+msgstr "Nastavení kvality obrázku"
 
 #. (itstool) path: page/p
 #: C/quality.page:11
 msgid ""
 "You can adjust the image quality that is used when the scan is converted to "
-"a file by changing this setting in the "
-"<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu. Using a low "
-"quality will result in a small file size but may show some blurring or "
-"blockiness in the image. A high quality will keep all the scanned "
-"information but require a larger file size. See the <link "
-"href=\"https://en.wikipedia.org/wiki/Lossy_compression\">Lossy compression "
-"Wikipedia page</link> for more information."
-msgstr ""
+"a file by changing this setting in the save dialog. Using a low quality will "
+"result in a small file size but may show some blurring or blockiness in the "
+"image. A high quality will keep all the scanned information but require a "
+"larger file size. See the <link href=\"https://en.wikipedia.org/wiki/"
+"Lossy_compression\">Lossy compression Wikipedia page</link> for more "
+"information."
+msgstr ""
+"Změnou nastavení v dialogovém okně pro ukládání si můžete přizpůsobit "
+"kvalitu obrázku, která se použije když je sken převáděn do souboru. "
+"Nastavení nízké kvality vede k malé velikosti souborů, ale projeví se "
+"rozmazáním nebo kostičkováním obrázku. Vysoká kvalita zachová všechny "
+"naskenované detaily, ale za cenu větší velikosti souboru. Více informací "
+"najdete na <link href=\"https://cs.wikipedia.org/wiki/Ztr%C3%A1tov"
+"%C3%A1_komprese\">stránce Wikipedie o ztrátové komprimaci</link>."
 
 #. (itstool) path: page/title
 #: C/reorder.page:9
 msgid "Reordering Pages"
-msgstr "Změna pořadí stránek"
+msgstr "Uspořádání stránek"
 
 #. (itstool) path: page/p
 #: C/reorder.page:11
@@ -450,6 +487,9 @@ msgid ""
 "To move a page, right click on it and choose <gui><em>Move Left</em></gui> "
 "or <gui><em>Move Right</em></gui>."
 msgstr ""
+"Když chcete stránku přesunout, klikněte na ni pravým tlačítkem a zvolte "
+"<gui><em>Posunout doleva</em></gui> nebo <gui><em>Posunout doprava</em></"
+"gui>."
 
 #. (itstool) path: page/p
 #: C/reorder.page:16
@@ -458,11 +498,14 @@ msgid ""
 "<gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "
 "\"Page\" menu."
 msgstr ""
+"Případně můžete stránku nejprve vybrat a pak v nabídce <gui>Stránka</gui> "
+"zvolit <gui><em>Posunout doprava</em></gui> nebo <gui><em>Posunout doleva</"
+"em></gui>."
 
 #. (itstool) path: page/title
 #: C/rotate.page:9
 msgid "Rotating a Page"
-msgstr ""
+msgstr "Otočení stránky"
 
 #. (itstool) path: page/p
 #: C/rotate.page:11
@@ -471,18 +514,19 @@ msgid ""
 "before or after scanning the page. Currently, there are four ways to rotate "
 "a page:"
 msgstr ""
+"V <app>Jednoduchém skenování</app> můžete změnit otočení stránky buď před "
+"jejím naskenováním, nebo až po něm. V současnosti existují čtyři způsoby, "
+"jak stránku otočit:"
 
 #. (itstool) path: steps/title
 #: C/rotate.page:17
 msgid "Use Toolbar Buttons"
-msgstr ""
+msgstr "Použití tlačítek na nástrojové liště"
 
 #. (itstool) path: item/p
-#: C/rotate.page:18
-#: C/rotate.page:29
-#: C/rotate.page:35
+#: C/rotate.page:18 C/rotate.page:29 C/rotate.page:35
 msgid "Select the page you want to rotate by clicking on it once."
-msgstr ""
+msgstr "Vyberte stránku, kterou chcete otočit tím, že na ni jednou kliknete."
 
 #. (itstool) path: item/p
 #: C/rotate.page:19
@@ -490,72 +534,75 @@ msgid ""
 "Press one of the arrows on the toolbar to rotate the page in the desired "
 "direction."
 msgstr ""
+"Zmáčkněte jednu ze šipek na nástrojové liště pro otočení stránky ve směru "
+"šipky."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:22
 msgid "Use Right Click"
-msgstr ""
+msgstr "Použití pravého kliknutí"
 
 #. (itstool) path: item/p
 #: C/rotate.page:23
 msgid "Right click on the page you want to rotate."
-msgstr ""
+msgstr "Klikněte pravým tlačítkem na stránku, kterou chcete otočit."
 
 #. (itstool) path: item/p
 #: C/rotate.page:24
 msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
-msgstr ""
+msgstr "V kontextové nabídce vyberte „Otočit doleva“ nebo „Otočit doprava“."
 
 #. (itstool) path: item/p
 #: C/rotate.page:30
-msgid ""
-"Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
+msgid "Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
 msgstr ""
+"Klikněte na nabídku „Stránka“ a vyberte „Otočit doleva“ nebo „Otočit "
+"doprava“."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:34
 msgid "Use Shortcuts"
-msgstr ""
+msgstr "Použití klávesových zkratek"
 
 #. (itstool) path: item/p
 #: C/rotate.page:36
 msgid "Press one of the following shortcut keys:"
-msgstr ""
+msgstr "Zmáčkněte jednu z následujících klávesových zkratek:"
 
 #. (itstool) path: td/p
 #: C/rotate.page:39
 msgid "<em>Command</em>"
-msgstr ""
+msgstr "<em>Příkaz</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:40
 msgid "<em>Shortcut Key</em>"
-msgstr ""
+msgstr "<em>Klávesová zkratka</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:43
 msgid "Rotate Left"
-msgstr ""
+msgstr "otočit doleva"
 
 #. (itstool) path: td/p
 #: C/rotate.page:44
 msgid "<key>[</key> (left bracket)"
-msgstr ""
+msgstr "<key>[</key> (levá hranatá závorka)"
 
 #. (itstool) path: td/p
 #: C/rotate.page:47
 msgid "Rotate Right"
-msgstr ""
+msgstr "otočit doprava"
 
 #. (itstool) path: td/p
 #: C/rotate.page:48
 msgid "<key>]</key> (right bracket)"
-msgstr ""
+msgstr "<key>]</key> (pravá hranatá závorka)"
 
 #. (itstool) path: note/p
 #: C/rotate.page:54
 msgid "Each new scanned page will use the previous rotation."
-msgstr ""
+msgstr "Nově naskenované stránky vždy použijí předchozí otočení."
 
 #. (itstool) path: page/title
 #: C/save.page:9
@@ -568,6 +615,9 @@ msgid ""
 "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>)."
 msgstr ""
+"Přejděte do nabídky <guiseq><gui>Dokument</gui><gui>Uložit jako</gui></"
+"guiseq> (nebo zmáčkněte <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></"
+"keyseq>)."
 
 #. (itstool) path: item/p
 #: C/save.page:18
@@ -575,31 +625,33 @@ msgid ""
 "From the \"Save As\" dialog box, choose one of the supported file types, or "
 "simply change the extension in the \"Name\" field."
 msgstr ""
+"V dialogovém okně vyberte jeden z podporovaných typů souborů, nebo jen "
+"změňte příponu v poli <gui>Název</gui>."
 
 #. (itstool) path: item/p
 #: C/save.page:23
 msgid "Press the \"Save\" button."
-msgstr ""
+msgstr "Zmáčkněte tlačítko <gui>Uložit</gui>."
 
 #. (itstool) path: table/title
 #: C/save.page:29
 msgid "Supported File Types"
-msgstr ""
+msgstr "Podporované typy souborů"
 
 #. (itstool) path: td/p
 #: C/save.page:31
 msgid "<em>Type</em>"
-msgstr ""
+msgstr "<em>Typ</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:32
 msgid "<em>Brief Description</em>"
-msgstr ""
+msgstr "<em>Stručný popis</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:35
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #. (itstool) path: td/p
 #: C/save.page:36
@@ -611,6 +663,12 @@ msgid ""
 "<link href=\"http://en.wikipedia.org/wiki/pdf\">PDF Wikipedia page</link> "
 "for more information."
 msgstr ""
+"PDF může obsahovat více stránek, podobně jako kniha, a jednoduše se tak "
+"předává ostatním. Jen velmi málo programů umí dokumenty PDF přímo upravovat, "
+"proto je tento formát vhodný především pro archivaci. Velikost dokumentu PDF "
+"je ovlivněna <link xref=\"quality\">kvalitou obrázků</link>. Více informací "
+"najdete na <link href=\"https://cs.wikipedia.org/wiki/"
+"Portable_Document_Format\">stránce Wikipedie o formátu PDF</link>."
 
 #. (itstool) path: td/p
 #: C/save.page:43
@@ -625,11 +683,20 @@ msgid ""
 "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. The size of the JPEG file is affected by the <link "
-"xref=\"quality\">image quality</link>. See the <link "
-"href=\"http://en.wikipedia.org/wiki/jpeg\">JPEG Wikipedia page</link> for "
-"more information."
-msgstr ""
+"the scanned images. The size of the JPEG file is affected by the <link xref="
+"\"quality\">image quality</link>. See the <link href=\"http://en.wikipedia."
+"org/wiki/jpeg\">JPEG Wikipedia page</link> for more information."
+msgstr ""
+"JPEG je formát souboru používaný digitálními fotoaparáty k ukládání obrázků. "
+"Soubory JPEG jsou relativně malé, snadno se předávají ostatním a jsou vhodné "
+"pro nahrávání na sociální sítě, ale za cenu ztráty kvality naskenovaného "
+"obrázku. Většina operačních systémů má v základu nějaký editor pro úpravy "
+"obrázků JPEG. Když skenujete více stránek, vytvoří se pro každou samostatný "
+"soubor JPEG. Tento formát použijte, když chcete naskenované obrázky "
+"upravovat nebo nahrávat na Internet. Velikost souboru JPEG je ovlivněna "
+"<link xref=\"quality\">kvalitou obrázku</link>. Více informací najdete na "
+"<link href=\"https://cs.wikipedia.org/wiki/JPEG\">stránce Wikipedie o "
+"formátu JPEG</link>."
 
 #. (itstool) path: td/p
 #: C/save.page:53
@@ -641,30 +708,41 @@ msgstr "PNG"
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Portable_Network_Graphics\">PNG Wikipedia page</link> for more "
+"information."
 msgstr ""
+"Soubory PNG obsahují surová data ze skeneru. Tím pádem jsou velké a nevhodné "
+"pro šíření, ale za to vám zachovají původní kvalitu naskenovaného obrázku. "
+"Když skenujete více stránek, vytvoří se pro každou z nich samostatný soubor "
+"PNG. Více informací najdete na <link href=\"https://cs.wikipedia.org/wiki/"
+"Portable_Network_Graphics\">stránce Wikipedie o formátu PNG</link>."
 
 #. (itstool) path: td/p
 #: C/save.page:61
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #. (itstool) path: td/p
 #: C/save.page:62
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Tagged_Image_File_Format\">TIFF Wikipedia page</link> for more "
+"information."
 msgstr ""
+"Soubory TIFF obsahují surová data ze skeneru. Tím pádem jsou velké a "
+"nevhodné pro šíření, ale za to vám zachovají původní kvalitu naskenovaného "
+"obrázku. Když skenujete více stránek, vytvoří se pro každou z nich "
+"samostatný soubor TIFF. Více informací najdete na <link href=\"https://cs."
+"wikipedia.org/wiki/Tagged_Image_File_Format\">stránce Wikipedie o formátu "
+"TIFF</link>."
 
 #. (itstool) path: page/title
 #: C/scanner.page:9
 msgid "Selecting a Scanner"
-msgstr "Vybrat scanner"
+msgstr "Výběr skeneru"
 
 #. (itstool) path: page/p
 #: C/scanner.page:11
@@ -672,6 +750,8 @@ msgid ""
 "If you have multiple scanning devices you can change the selected device "
 "from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"V případě, že máte více skenovacích zařízení, můžete změnit výběr přes "
+"nabídku <guiseq><gui>Dokument</gui><gui>Předvolby</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/scanner.page:15
@@ -681,6 +761,11 @@ msgid ""
 "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."
 msgstr ""
+"Místní skenery se vyhledají automaticky při každém spuštění aplikace "
+"<app>Jednoduché skenování</app> a skenery USB při každém jejich připojení. "
+"Pokud ale připojíte síťový skener až ve chvíli, když již <app>Jednoduché "
+"skenování</app> běží, musíte aplikaci <app>Jednoduché skenování</app> "
+"restartovat, aby skener objevila."
 
 #. (itstool) path: info/title
 #: C/scanning.page:6
@@ -691,22 +776,22 @@ msgstr "0"
 #. (itstool) path: page/title
 #: C/scanning.page:10
 msgid "Scanning a Page"
-msgstr "Skenovat stránku"
+msgstr "Skenování stránky"
 
 #. (itstool) path: page/p
 #: C/scanning.page:12
 msgid "To scan a document from your scanner:"
-msgstr "Skenování dokumentu ze skeneru:"
+msgstr "Když chcete skenerem naskenovat dokument:"
 
 #. (itstool) path: item/p
 #: C/scanning.page:16
 msgid "Connect the scanner to your computer and power it on."
-msgstr ""
+msgstr "Připojte skener ke svému počítači a zapněte jej."
 
 #. (itstool) path: item/p
 #: C/scanning.page:17
 msgid "Open <app>Simple Scan</app>."
-msgstr "Otevřte <app>Jednoduché skenování</app>."
+msgstr "Otevřete aplikaci <app>Jednoduché skenování</app>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:18
@@ -714,13 +799,17 @@ msgid ""
 "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>."
 msgstr ""
+"Klikněte na šipku vedle tlačítka „Skenovat“ a zvolte typ dokumentu, který "
+"skenujete: <em>Fotografie</em> nebo <em>Text</em>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:21
 msgid ""
-"Click the \"Scan\" button on the toolbar (or press "
-"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
+"Click the \"Scan\" button on the toolbar (or press <keyseq><key>Ctrl</"
+"key><key>1</key></keyseq>)."
 msgstr ""
+"Klikněte na tlačítko „Skenovat“ na nástrojové liště (nebo zmáčkněte "
+"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
 
 #. (itstool) path: note/p
 #: C/scanning.page:24
@@ -729,13 +818,21 @@ msgid ""
 "the <key>Esc</key> key on the keyboard. Each page you scan is placed at the "
 "end of the document."
 msgstr ""
+"Při skenování se bude průběžně objevovat skenovaná stránka. Skenování můžete "
+"kdykoliv zastavit zmáčknutím klávesy <key>Esc</key>. Nově naskenovaná "
+"stránka je vždy umístěna na konec dokumentu."
 
 #. (itstool) path: page/p
 #: C/scanning.page:29
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr ""
+"Typ dokumentu se dá změnit také přes nabídku <guiseq><gui>Dokument</"
+"gui><gui>Skenovat</gui></guiseq>. Pro rychlé skenování v odstínech šedi "
+"vyberte <gui><em>Text</em></gui>, pro skenování ve vysoké kvalitě a barvě "
+"pak <gui><em>Fotografie</em></gui>. Více podrobností a dalších voleb viz "
+"<link xref=\"dpi\"/>."
diff --git a/help/cs/cs.stamp b/help/cs/cs.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/cs/cs.stamp
+++ /dev/null
diff --git a/help/cs/dpi.page b/help/cs/dpi.page
deleted file mode 100644
index 56d5564..0000000
--- a/help/cs/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Nastavení rozlišení</title>
-
-    <p>
-    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/cs/email.page b/help/cs/email.page
deleted file mode 100644
index 4f86008..0000000
--- a/help/cs/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Odeslání emailem</title>
-
-    <p>Pro odeslání stávajícího dokumentu emailem použijte nabídku <guiseq><gui>Dokument</gui><gui>E-mail</gui></guiseq> (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Emailový program otevře novou zprávu s naskenovaným dokumentem v příloze.</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>Pro více informací o souborových formátech navštivte <link xref="save"/>.</p>
-</page>
diff --git a/help/cs/index.page b/help/cs/index.page
deleted file mode 100644
index 515b650..0000000
--- a/help/cs/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="cs">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Skenování stránek</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Úprava dokumentu</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Využití dokumentu</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/cs/legal.xml b/help/cs/legal.xml
deleted file mode 100644
index b3e8860..0000000
--- a/help/cs/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Tato práce je zveřejněna pod licencí <link href="http://creativecommons.org/licenses/by-sa/3.0/">Licence Creative Commons Attribution-Share Alike 3.0 Unported</link>.</p>
-<p>Držitelé práv udělují zvláštní výjimku ke kopírování, úpravě a distribuci vzorového kódu obsaženého v tomto dokumentu za podmínek, které si vyberete. Bez omezení.</p>
-</license>
diff --git a/help/cs/print.page b/help/cs/print.page
deleted file mode 100644
index c0674d9..0000000
--- a/help/cs/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Tisk</title>
-
-    <p>
-    <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/cs/quality.page b/help/cs/quality.page
deleted file mode 100644
index 78d9bf5..0000000
--- a/help/cs/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/cs/reorder.page b/help/cs/reorder.page
deleted file mode 100644
index 7844507..0000000
--- a/help/cs/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Změna pořadí stránek</title>
-
-    <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>
-    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/cs/rotate.page b/help/cs/rotate.page
deleted file mode 100644
index 7c899dd..0000000
--- a/help/cs/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/cs/save.page b/help/cs/save.page
deleted file mode 100644
index 54b7801..0000000
--- a/help/cs/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Uložení do souboru</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/cs/scanner.page b/help/cs/scanner.page
deleted file mode 100644
index 8c9a13a..0000000
--- a/help/cs/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Vybrat scanner</title>
-
-    <p>
-    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 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/cs/scanning.page b/help/cs/scanning.page
deleted file mode 100644
index 3560161..0000000
--- a/help/cs/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="cs">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Skenovat stránku</title>
-
-    <p>Skenování dokumentu ze skeneru:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Otevřte <app>Jednoduché skenování</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>
-
-    <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>
-      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/de/adf.page b/help/de/adf.page
deleted file mode 100644
index 9460a85..0000000
--- a/help/de/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Benutzung eines automatischen Dokumenteneinzuges</title>
-
-    <p>
-    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>Die Werkzeugleistenknöpfe benutzen</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 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/brightness-contrast.page b/help/de/brightness-contrast.page
deleted file mode 100644
index 170e7ee..0000000
--- a/help/de/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/de/crop.page b/help/de/crop.page
deleted file mode 100644
index c344ab7..0000000
--- a/help/de/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Zuschneiden</title>
-
-    <p>
-    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/de/de.po b/help/de/de.po
index 874822b..43d3282 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -1,21 +1,27 @@
 # German 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.
+# Etienne Ruedin https://launchpad.net/~ruedin
+# Phillip Sz https://launchpad.net/~phillip-sz
+# Silke Hamann https://launchpad.net/~silkehamann
+# Thomas https://launchpad.net/~tz2
+# Tobias Bannert <tobannert@gmail.com>, 2016.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2016-07-09 20:46+0000\n"
-"Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"
-"Language-Team: German <de@li.org>\n"
+"POT-Creation-Date: 2017-07-24 08:55+0000\n"
+"PO-Revision-Date: 2017-09-23 12:52+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -26,53 +32,9 @@ msgstr ""
 "  Phillip Sz https://launchpad.net/~phillip-sz\n"
 "  Silke Hamann https://launchpad.net/~silkehamann\n"
 "  Thomas https://launchpad.net/~tz2\n"
-"  Tobias Bannert https://launchpad.net/~toba"
-
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr "Ali Shtarbanov"
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Seiten scannen"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Dokument anpassen"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Dokument verwenden"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
+"  Tobias Bannert https://launchpad.net/~toba\n"
+"\n"
+"Mario Blättermann <mario.blaettermann@gmail.com>, 2017"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -85,23 +47,23 @@ msgid ""
 "If your scanner features an Automatic Document Feeder (ADF) you can scan all "
 "the pages from the feeder via one of following methods:"
 msgstr ""
+"Wenn Ihr Scanner über einen automatischen Dokumenteneinzug (ADF) verfügt, "
+"können Sie alle Seiten aus dem Einzug auf die folgenden Arten scannen lassen:"
 
 #. (itstool) path: steps/title
 #: C/adf.page:17
 msgid "Use a Keyboard Shortcut"
-msgstr ""
+msgstr "Mit einer Tastenkombination"
 
 #. (itstool) path: item/p
 #: C/adf.page:19
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr ""
+msgstr "Drücken Sie <keyseq><key>Strg</key><key>F</key></keyseq>"
 
 #. (itstool) path: steps/title
-#: C/adf.page:24
-#: C/crop.page:27
-#: C/rotate.page:28
+#: C/adf.page:24 C/crop.page:27 C/rotate.page:28
 msgid "Use a Menu"
-msgstr ""
+msgstr "Aus dem Menü"
 
 #. (itstool) path: item/p
 #: C/adf.page:26
@@ -109,6 +71,8 @@ msgid ""
 "Navigate to <guiseq><gui>Document</gui> <gui>Scan</gui><gui>All Pages From "
 "Feeder</gui></guiseq>."
 msgstr ""
+"Wählen Sie <guiseq><gui>Dokument</gui> <gui>Scannen</gui><gui>Alle Seiten "
+"aus dem Papiereinzug</gui></guiseq>."
 
 #. (itstool) path: steps/title
 #: C/adf.page:33
@@ -118,25 +82,24 @@ msgstr "Die Werkzeugleistenknöpfe benutzen"
 #. (itstool) path: item/p
 #: C/adf.page:35
 msgid "Click on the arrow to the right of the \"Scan\" button."
-msgstr ""
+msgstr "Klicken Sie auf den Pfeil rechts vom »Scan«-Knopf."
 
 #. (itstool) path: item/p
 #: C/adf.page:38
 msgid "Choose \"All Pages From Feeder\"."
-msgstr ""
+msgstr "Wählen Sie <gui>Alle Seiten aus dem Papiereinzug</gui>."
 
 #. (itstool) path: item/media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:39
-#: C/scanning.page:20
+#: C/adf.page:39 C/scanning.page:20
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
 "md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
-msgstr ""
+msgstr "ok'"
 
 #. (itstool) path: note/p
 #: C/adf.page:45
@@ -145,6 +108,9 @@ msgid ""
 "capability. You can choose single side scanning from the "
 "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"In der Voreinstellung werden beide Seiten eines Blattes eingescannt, sofern "
+"Ihr Scanner dazu in der Lage ist. Einseitiges Scannen können Sie im Menü "
+"<guiseq><gui>Dokument</gui><gui>Einstellungen</gui></guiseq> auswählen."
 
 #. (itstool) path: note/media
 #. (itstool) path: page/media
@@ -152,18 +118,16 @@ msgstr ""
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:49
-#: C/dpi.page:16
-#: C/scanner.page:14
+#: C/adf.page:49 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
 msgid ""
 "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
-msgstr ""
+msgstr "ok'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
 msgid "Setting brightness and Contrast"
-msgstr ""
+msgstr "Helligkeit und Kontrast einstellen"
 
 #. (itstool) path: page/p
 #: C/brightness-contrast.page:11
@@ -173,6 +137,10 @@ msgid ""
 "settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> "
 "menu."
 msgstr ""
+"Einige Scanner ermöglichen Ihnen, die Helligkeit und den Kontrast beim "
+"Scannen anzupassen. Wenn Ihr Scan zu dunkel oder zu hell ist, können Sie "
+"diese Einstellungen im Menü <guiseq><gui>Dokument</gui><gui>Einstellungen</"
+"gui></guiseq> ändern."
 
 #. (itstool) path: page/title
 #: C/crop.page:9
@@ -189,16 +157,25 @@ msgid ""
 "used shown in gray. You can enable crop and choose the desired dimensions "
 "via one of the following methods:"
 msgstr ""
+"Die Zuschneidefunktion in <app>Simple Scan</app> ermöglicht es Ihnen, nur "
+"einen Teil des eingescannten Bildes zu verwenden. Sie können das Zuschneiden "
+"entweder vor oder nach dem Scannen einer Seite aktivieren und die "
+"Dimensionen des Zuschnittrahmens jederzeit ändern. Wenn Zuschneiden "
+"aktiviert ist, wird eine Maske über die aktuelle Seite gelegt, welche den "
+"nicht zu verwendenden Bereich grau darstellt. Sie können das Zuschneiden und "
+"die Auswahl des gewünschten Bereichs auf folgende Arten aktivieren:"
 
 #. (itstool) path: steps/title
 #: C/crop.page:19
 msgid "Use a Right Click"
-msgstr ""
+msgstr "Mit einem Rechtsklick"
 
 #. (itstool) path: item/p
 #: C/crop.page:20
 msgid "Right click anywhere on the image area and select \"Crop\"."
 msgstr ""
+"Klicken Sie auf eine beliebige Stelle im Bildbereich und wählen Sie "
+"<gui>Zuschneiden</gui>."
 
 #. (itstool) path: item/p
 #: C/crop.page:21
@@ -206,17 +183,21 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually set "
 "the crop frame's dimensions by dragging its borders."
 msgstr ""
+"Wählen Sie entweder einen der festen Zuschneiderahmen aus oder wählen Sie "
+"<gui>Benutzerdefiniert</gui>, um die Abmessungen des Zuschneiderahmens durch "
+"Ziehen der Ränder anzupassen."
 
 #. (itstool) path: item/p
-#: C/crop.page:23
-#: C/crop.page:30
+#: C/crop.page:23 C/crop.page:30
 msgid "Click and hold the frame, then move it to the desired position."
 msgstr ""
+"Klicken Sie den Rahmen an und halten Sie die Maustaste gedrückt, dann ziehen "
+"Sie ihn an die gewünschte Position."
 
 #. (itstool) path: item/p
 #: C/crop.page:28
 msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
-msgstr ""
+msgstr "Wählen Sie <guiseq><gui>Seite</gui><gui>Zuschneiden</gui></guiseq>."
 
 #. (itstool) path: item/p
 #: C/crop.page:29
@@ -224,16 +205,20 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually adjust "
 "the frame's dimensions by dragging its borders."
 msgstr ""
+"Wählen Sie entweder einen der festen Zuschneiderahmen aus oder wählen Sie "
+"<gui>Benutzerdefiniert</gui>, um die Abmessungen des Zuschneiderahmens durch "
+"Ziehen der Ränder anzupassen."
 
 #. (itstool) path: steps/title
 #: C/crop.page:34
 msgid "Use the Toolbar"
-msgstr ""
+msgstr "Aus der Werkzeugleiste"
 
 #. (itstool) path: item/p
 #: C/crop.page:35
 msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
 msgstr ""
+"Klicken Sie auf den <gui>Zuschneiden</gui>-Knopf in der Werkzeugleiste."
 
 #. (itstool) path: note/p
 #: C/crop.page:36
@@ -241,17 +226,20 @@ msgid ""
 "This is the same as choosing \"Custom\" in step 2 of the aforementioned "
 "methods."
 msgstr ""
+"Dies ist gleichbedeutend mit <gui>Benutzerdefiniert</gui> in Schritt 2 der "
+"bereits genannten Methoden."
 
 #. (itstool) path: item/p
 #: C/crop.page:38
 msgid ""
 "Drag the borders of the frame to set the desired dimensions and position."
 msgstr ""
+"Ziehen Sie die Ränder des Rahmens auf die gewünschte Größe und Position."
 
 #. (itstool) path: note/p
 #: C/crop.page:42
 msgid "Each new scanned page will use the previous crop."
-msgstr ""
+msgstr "Für jede neue Seite wird der vorherige Zuschneiderahmen verwendet."
 
 #. (itstool) path: page/title
 #: C/dpi.page:9
@@ -263,9 +251,13 @@ msgstr "Scan-Auflösung einstellen"
 msgid ""
 "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."
+"You can change these settings from the <guiseq><gui>Document</"
+"gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Die voreingestellte Auflösung für den Dokumenttyp <gui><em>Text</em></gui> "
+"ist 150 dpi (Punkte pro Zoll) und 300 dpi für den Dokumenttyp <gui><em>Foto</"
+"em></gui>. Sie können diese Vorgaben im Menü <guiseq><gui>Dokument</"
+"gui><gui>Einstellungen</gui></guiseq> ändern."
 
 #. (itstool) path: page/p
 #: C/dpi.page:18
@@ -273,60 +265,58 @@ msgid ""
 "The available scanning resolutions for both document types (Text and Photo) "
 "are the same and are listed in the following table:"
 msgstr ""
+"Die verfügbaren Scanauflösungen sind gleichermaßen für beide Dokumenttypen "
+"verfügbar (Text und Foto) und in der folgenden Tabelle aufgelistet:"
 
 #. (itstool) path: td/p
 #: C/dpi.page:23
 msgid "<em>Text Resolution</em>"
-msgstr ""
+msgstr "<em>Textauflösung</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:24
 msgid "<em>Photo Resolution</em>"
-msgstr ""
+msgstr "<em>Fotoauflösung</em>"
 
 #. (itstool) path: td/p
-#: C/dpi.page:27
-#: C/dpi.page:28
+#: C/dpi.page:27 C/dpi.page:28
 msgid "75 dpi (draft)"
-msgstr ""
+msgstr "75 dpi (Vorschau)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:31
 msgid "150 dpi (default)"
-msgstr ""
+msgstr "150 dpi (Standard)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:32
 msgid "150 dpi"
-msgstr ""
+msgstr "150 dpi"
 
 #. (itstool) path: td/p
 #: C/dpi.page:35
 msgid "300 dpi"
-msgstr ""
+msgstr "300 dpi"
 
 #. (itstool) path: td/p
 #: C/dpi.page:36
 msgid "300 dpi (default)"
-msgstr ""
+msgstr "300 dpi (Standard)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:39
-#: C/dpi.page:40
+#: C/dpi.page:39 C/dpi.page:40
 msgid "600 dpi"
-msgstr ""
+msgstr "600 dpi"
 
 #. (itstool) path: td/p
-#: C/dpi.page:43
-#: C/dpi.page:44
+#: C/dpi.page:43 C/dpi.page:44
 msgid "1200 dpi (high resolution)"
-msgstr ""
+msgstr "1200 dpi (Hochauflösend)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:47
-#: C/dpi.page:48
+#: C/dpi.page:47 C/dpi.page:48
 msgid "2400 dpi"
-msgstr ""
+msgstr "2400 dpi"
 
 #. (itstool) path: note/p
 #: C/dpi.page:52
@@ -335,6 +325,9 @@ msgid ""
 "while <gui><em>Photo</em></gui> documents are always scanned in color, at "
 "any resolution!"
 msgstr ""
+"<gui><em>Text</em></gui>dokumente werden stets in Schwarzweiß eingescannt, "
+"während <gui><em>Foto</em></gui>dokumente immer farbig eingescannt werden, "
+"in jeder Auflösung!"
 
 #. (itstool) path: page/title
 #: C/email.page:9
@@ -344,39 +337,83 @@ msgstr "Per E-Mail versenden"
 #. (itstool) path: page/p
 #: C/email.page:11
 msgid ""
-"To email the current document use the "
-"<guiseq><gui>Document</gui><gui>Email</gui></guiseq> menu "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be "
-"opened with a new message containing the scanned document as an attachment."
+"To email the current document use the <guiseq><gui>Document</gui><gui>Email</"
+"gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your "
+"email program will be opened with a new message containing the scanned "
+"document as an attachment."
 msgstr ""
-"Um das Dokument per E-Mail zu versenden, bitte im Menü "
-"<guiseq><gui>Dokument</gui><gui>E-Mail</gui></guiseq> öffnen "
-"(<keyseq><key>Strg</key><key>E</key></keyseq>). Dadurch wird Ihr E-Mail-"
-"Programm mit einer neuen Nachricht geöffnet, die das eingelesene Dokument "
-"als Anhang enthält."
+"Um das Dokument per E-Mail zu versenden, verwenden Sie "
+"<guiseq><gui>Dokument</gui><gui>E-Mail</gui></guiseq> (<keyseq><key>Strg</"
+"key><key>E</key></keyseq>). Dadurch wird Ihr E-Mail-Programm mit einer neuen "
+"Nachricht geöffnet, die das eingelesene Dokument als Anhang enthält."
 
 #. (itstool) path: page/p
 #: C/email.page:16
 msgid ""
 "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."
+"attachment for each page. Conversely, if the document type was set to \"Photo"
+"\", the email will have a JPEG attachment for each page."
 msgstr ""
+"Wenn der Dokumenttyp auf <gui>Text</gui> gesetzt war, erhält die E-Mail "
+"einen PDF-Anhang für jede Seite. War der Dokumenttyp auf <gui>Foto</gui> "
+"gesetzt, erhält die E-Mail einen JPEG-Anhang für jede Seite."
 
 #. (itstool) path: page/p
 #: C/email.page:21
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
+"In <link xref=\"save\"/> finden Sie weitere Informationen zu Dateiformaten."
+
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr "ok'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Handbuch zu Simple Scan"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Seiten scannen"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Dokument anpassen"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Dokument verwenden"
 
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
-msgstr ""
+msgstr "Creative Commons Attribution-Share Alike 3.0 Unported License"
 
 #. (itstool) path: license/p
 #: C/legal.xml:3
 msgid "This work is licensed under a <_:link-1/>."
-msgstr ""
+msgstr "Dieses Werk wird unter einer <_:link-1/> verbreitet."
 
 #. (itstool) path: license/p
 #: C/legal.xml:6
@@ -385,6 +422,9 @@ msgid ""
 "modify, and distribute the example code contained in this document under the "
 "terms of your choosing, without restriction."
 msgstr ""
+"Als besondere Ausnahme geben Ihnen die Urheberrechtsinhaber die Genehmigung, "
+"den in diesem Dokument enthaltenen Beispielcode ohne Einschränkung unter den "
+"Bedingungen Ihrer Wahl zu verbreiten."
 
 #. (itstool) path: page/title
 #: C/print.page:9
@@ -399,11 +439,14 @@ msgid ""
 "<app>Simple Scan</app> a very convenient tool for making copies of documents "
 "or photos."
 msgstr ""
+"Mit <app>Simple Scan</app> können Sie ein eingescanntes Dokument direkt "
+"ausdrucken, ohne es vorher speichern zu müssen. Dadurch wird <app>Simple "
+"Scan</app> zu einem bequemen Werkzeug zum Kopieren von Dokumenten oder Fotos."
 
 #. (itstool) path: steps/title
 #: C/print.page:17
 msgid "To Print a Document"
-msgstr ""
+msgstr "Ein Dokument drucken"
 
 #. (itstool) path: item/p
 #: C/print.page:19
@@ -412,6 +455,9 @@ msgid ""
 "the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>. This "
 "will open the \"Print\" dialog box."
 msgstr ""
+"Wählen Sie <guiseq><gui>Dokument</gui><gui>Drucken</gui> </guiseq> oder "
+"drücken Sie <keyseq><key>Strl</key><key>P</key></keyseq>. Dadurch wird der "
+"Druckdialog geöffnet."
 
 #. (itstool) path: item/p
 #: C/print.page:25
@@ -419,24 +465,33 @@ msgid ""
 "From the \"Print\" dialog box choose your desired printing settings and/or "
 "Print Preview the document, then press the \"Print\" button."
 msgstr ""
+"Wählen Sie im Dialog <gui>Drucken</gui> Ihre gewünschten Druckeinstellungen "
+"und/oder Vorschaueinstellungen und klicken anschließend auf den Knopf "
+"<gui>Drucken</gui>."
 
 #. (itstool) path: page/title
 #: C/quality.page:9
 msgid "Setting the Image Quality"
-msgstr ""
+msgstr "Einstellen der Bildqualität"
 
 #. (itstool) path: page/p
 #: C/quality.page:11
 msgid ""
 "You can adjust the image quality that is used when the scan is converted to "
-"a file by changing this setting in the "
-"<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu. Using a low "
-"quality will result in a small file size but may show some blurring or "
-"blockiness in the image. A high quality will keep all the scanned "
-"information but require a larger file size. See the <link "
-"href=\"https://en.wikipedia.org/wiki/Lossy_compression\">Lossy compression "
-"Wikipedia page</link> for more information."
-msgstr ""
+"a file by changing this setting in the save dialog. Using a low quality will "
+"result in a small file size but may show some blurring or blockiness in the "
+"image. A high quality will keep all the scanned information but require a "
+"larger file size. See the <link href=\"https://en.wikipedia.org/wiki/"
+"Lossy_compression\">Lossy compression Wikipedia page</link> for more "
+"information."
+msgstr ""
+"Im Speichern-Dialog können Sie die Bildqualität bei der Umwandlung in eine "
+"Datei ändern. Eine geringe Qualität ergibt eine geringe Dateigröße, aber das "
+"Bild kann unscharf sein oder ein Klötzchenmuster zeigen. Eine hohe Qualität "
+"erhält alle eingescannten Informationen, führt aber zu einer größeren Datei. "
+"Auf der <link href=\"https://en.wikipedia.org/wiki/Lossy_compression"
+"\">Wikipedia-Seite zur verlustbehafteten Kompression</link> erhalten Sie "
+"weitere Informationen dazu (derzeit nur auf Englisch, Juli 2017)."
 
 #. (itstool) path: page/title
 #: C/reorder.page:9
@@ -449,6 +504,9 @@ msgid ""
 "To move a page, right click on it and choose <gui><em>Move Left</em></gui> "
 "or <gui><em>Move Right</em></gui>."
 msgstr ""
+"Um eine Seite zu verschieben, klicken Sie mit der rechten Maustaste darauf "
+"und wählen Sie <gui>Nach links schieben</gui> oder <gui>Nach rechts "
+"schieben</gui>."
 
 #. (itstool) path: page/p
 #: C/reorder.page:16
@@ -457,11 +515,14 @@ msgid ""
 "<gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "
 "\"Page\" menu."
 msgstr ""
+"Alternativ können Sie eine Seite verschieben, indem Sie sie zuerst auswählen "
+"und dann <gui>Nach links schieben</gui> oder <gui>Nach rechts schieben</gui> "
+"im Menü <gui>Seite</gui> wählen."
 
 #. (itstool) path: page/title
 #: C/rotate.page:9
 msgid "Rotating a Page"
-msgstr ""
+msgstr "Eine Seite drehen"
 
 #. (itstool) path: page/p
 #: C/rotate.page:11
@@ -470,18 +531,19 @@ msgid ""
 "before or after scanning the page. Currently, there are four ways to rotate "
 "a page:"
 msgstr ""
+"In <app>Simple Scan</app> können Sie die Drehung einer Seite entweder vor "
+"oder nach dem Scannen vornehmen. Gegenwärtig gibt es vier Möglichkeiten, "
+"eine Seite zu drehen:"
 
 #. (itstool) path: steps/title
 #: C/rotate.page:17
 msgid "Use Toolbar Buttons"
-msgstr ""
+msgstr "Aus der Werkzeugleiste"
 
 #. (itstool) path: item/p
-#: C/rotate.page:18
-#: C/rotate.page:29
-#: C/rotate.page:35
+#: C/rotate.page:18 C/rotate.page:29 C/rotate.page:35
 msgid "Select the page you want to rotate by clicking on it once."
-msgstr ""
+msgstr "Wählen Sie die zu drehende Seite aus, indem Sie sie anklicken."
 
 #. (itstool) path: item/p
 #: C/rotate.page:19
@@ -489,72 +551,80 @@ msgid ""
 "Press one of the arrows on the toolbar to rotate the page in the desired "
 "direction."
 msgstr ""
+"Klicken Sie auf einen der Knöpfe in der Werkzeugleiste, um die Seite in der "
+"gewünschten Richtung zu drehen."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:22
 msgid "Use Right Click"
-msgstr ""
+msgstr "Mit einem Rechtsklick"
 
 #. (itstool) path: item/p
 #: C/rotate.page:23
 msgid "Right click on the page you want to rotate."
 msgstr ""
+"Klicken Sie mit der rechten Maustaste auf die Seite, die Sie drehen wollen."
 
 #. (itstool) path: item/p
 #: C/rotate.page:24
 msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
 msgstr ""
+"Wählen Sie im Kontextmenü <gui>Links herum drehen</gui> oder <gui>Rechts "
+"herum drehen</gui> aus."
 
 #. (itstool) path: item/p
 #: C/rotate.page:30
-msgid ""
-"Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
+msgid "Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
 msgstr ""
+"Klicken Sie auf das <gui>Seite</gui>-Menü und wählen Sie <gui>Nach links "
+"schieben</gui> oder <gui>Nach rechts schieben</gui>."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:34
 msgid "Use Shortcuts"
-msgstr ""
+msgstr "Mit einer Tastenkombination"
 
 #. (itstool) path: item/p
 #: C/rotate.page:36
 msgid "Press one of the following shortcut keys:"
-msgstr ""
+msgstr "Drücken Sie eine der folgenden Tastenkombinationen:"
 
 #. (itstool) path: td/p
 #: C/rotate.page:39
 msgid "<em>Command</em>"
-msgstr ""
+msgstr "<em>Befehl</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:40
 msgid "<em>Shortcut Key</em>"
-msgstr ""
+msgstr "<em>Tastenkombination</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:43
 msgid "Rotate Left"
-msgstr ""
+msgstr "Links drehen"
 
 #. (itstool) path: td/p
 #: C/rotate.page:44
 msgid "<key>[</key> (left bracket)"
-msgstr ""
+msgstr "<key>[</key> (linke eckige Klammer)"
 
 #. (itstool) path: td/p
 #: C/rotate.page:47
 msgid "Rotate Right"
-msgstr ""
+msgstr "Rechts drehen"
 
 #. (itstool) path: td/p
 #: C/rotate.page:48
 msgid "<key>]</key> (right bracket)"
-msgstr ""
+msgstr "<key>]</key> (rechte eckige Klammer)"
 
 #. (itstool) path: note/p
 #: C/rotate.page:54
 msgid "Each new scanned page will use the previous rotation."
 msgstr ""
+"Jede neu gescannte Seite wird auf die gleiche Weise gedreht wie die "
+"vorherige Seite."
 
 #. (itstool) path: page/title
 #: C/save.page:9
@@ -567,6 +637,9 @@ msgid ""
 "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>)."
 msgstr ""
+"Wählen Sie <guiseq><gui>Dokument</gui><gui>Speichern unter</gui></guiseq> "
+"(oder drücken Sie <keyseq><key>Umschalttaste</key><key>Strg</key><key>S</"
+"key></keyseq>)."
 
 #. (itstool) path: item/p
 #: C/save.page:18
@@ -574,31 +647,34 @@ msgid ""
 "From the \"Save As\" dialog box, choose one of the supported file types, or "
 "simply change the extension in the \"Name\" field."
 msgstr ""
+"Wählen Sie im Dialog <gui>Speichern unter</gui> einen der unterstützten "
+"Dateitypen aus oder ändern Sie einfach die Dateinamenserweiterung im Feld "
+"<gui>Name</gui>."
 
 #. (itstool) path: item/p
 #: C/save.page:23
 msgid "Press the \"Save\" button."
-msgstr ""
+msgstr "Klicken Sie auf <gui>Speichern</gui>."
 
 #. (itstool) path: table/title
 #: C/save.page:29
 msgid "Supported File Types"
-msgstr ""
+msgstr "Unterstützte Dateitypen"
 
 #. (itstool) path: td/p
 #: C/save.page:31
 msgid "<em>Type</em>"
-msgstr ""
+msgstr "<em>Typ</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:32
 msgid "<em>Brief Description</em>"
-msgstr ""
+msgstr "<em>Kurzbeschreibung</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:35
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #. (itstool) path: td/p
 #: C/save.page:36
@@ -610,6 +686,13 @@ msgid ""
 "<link href=\"http://en.wikipedia.org/wiki/pdf\">PDF Wikipedia page</link> "
 "for more information."
 msgstr ""
+"Wie ein Buch kann ein PDF-Dokument mehrere Seiten enthalten und lässt sich "
+"leicht weitergeben. Es gibt nur wenige Linux-Programme, die PDF-Dokumente "
+"bearbeiten können, daher wird dieses Format primär für Archivierungszwecke "
+"empfohlen. Die Größe des PDF-Dokuments ist von der <link xref=\"quality"
+"\">Bildqualität</link> abhängig. Auf der <link href=\"https://de.wikipedia."
+"org/wiki/Portable_Document_Format\">Wikipedia-Seite zu PDF</link> finden Sie "
+"weitere Informationen darüber."
 
 #. (itstool) path: td/p
 #: C/save.page:43
@@ -624,11 +707,20 @@ msgid ""
 "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. The size of the JPEG file is affected by the <link "
-"xref=\"quality\">image quality</link>. See the <link "
-"href=\"http://en.wikipedia.org/wiki/jpeg\">JPEG Wikipedia page</link> for "
-"more information."
-msgstr ""
+"the scanned images. The size of the JPEG file is affected by the <link xref="
+"\"quality\">image quality</link>. See the <link href=\"http://en.wikipedia."
+"org/wiki/jpeg\">JPEG Wikipedia page</link> for more information."
+msgstr ""
+"JPEG ist das Dateiformat, das von Digitalkameras für die Bildspeicherung "
+"verwendet wird. Eine JPEG-Datei ist relativ klein, einfach weiterzugeben und "
+"für das Hochladen in soziale Netzwerke geeignet. Die meisten Betriebssysteme "
+"liefern bereits einen JPEG-Editor mit. Wenn Sie mehrere Seiten eingescannt "
+"haben, wird eine JPEG-Datei für jede Seite erzeugt. Verwenden Sie diesen "
+"Dateityp, wenn Sie die eingescannten Bilder bearbeiten oder irgendwo "
+"hochladen wollen. Die Größe der JPEG-Datei ist von der <link xref=\"quality"
+"\">Bildqualität</link> abhängig. Auf der <link href=\"http://de.wikipedia."
+"org/wiki/JPEG\">Wikipedia-Seite zu JPEG</link> finden Sie weitere "
+"Informationen darüber."
 
 #. (itstool) path: td/p
 #: C/save.page:53
@@ -640,25 +732,35 @@ msgstr "PNG"
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Portable_Network_Graphics\">PNG Wikipedia page</link> for more "
+"information."
 msgstr ""
+"PNG-Dateien enthalten die Rohdaten aus dem Scanner. Dadurch werden sie sehr "
+"groß und eignen sich nicht für die Weitergabe. Wenn Sie mehrere Seiten "
+"eingescannt haben, wird eine PNG-Datei für jede Seite erzeugt. Auf der <link "
+"href=\"http://de.wikipedia.org/wiki/Portable_Network_Graphics\">Wikipedia-"
+"Seite zu PNG</link> finden Sie weitere Informationen."
 
 #. (itstool) path: td/p
 #: C/save.page:61
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #. (itstool) path: td/p
 #: C/save.page:62
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Tagged_Image_File_Format\">TIFF Wikipedia page</link> for more "
+"information."
 msgstr ""
+"TIFF-Dateien enthalten die Rohdaten aus dem Scanner. Dadurch werden sie sehr "
+"groß und eignen sich nicht für die Weitergabe. Wenn Sie mehrere Seiten "
+"eingescannt haben, wird eine TIFF-Datei für jede Seite erzeugt. Auf der "
+"<link href=\"http://de.wikipedia.org/wiki/Tagged_Image_File_Format"
+"\">Wikipedia-Seite zu TIFF</link> finden Sie weitere Informationen."
 
 #. (itstool) path: page/title
 #: C/scanner.page:9
@@ -671,6 +773,8 @@ msgid ""
 "If you have multiple scanning devices you can change the selected device "
 "from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Wenn Sie über mehrere Scanner verfügen, können Sie das ausgewählte Gerät im "
+"Menü <guiseq><gui>Dokument</gui><gui>Einstellungen</gui></guiseq> ändern."
 
 #. (itstool) path: page/p
 #: C/scanner.page:15
@@ -680,6 +784,11 @@ msgid ""
 "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."
 msgstr ""
+"Bei jedem Start von <app>Simple Scan</app> und bei jedem Anschließen eines "
+"USB-Scanners werden lokale Scanner automatisch erkannt. Wenn Sie einen "
+"Netzwerkscanner anschließen, während <app>Simple Scan</app> bereits läuft, "
+"müssen Sie <app>Simple Scan</app> neu starten, damit der Scanner erkannt "
+"wird."
 
 #. (itstool) path: info/title
 #: C/scanning.page:6
@@ -695,12 +804,12 @@ msgstr "Eine Seite scannen"
 #. (itstool) path: page/p
 #: C/scanning.page:12
 msgid "To scan a document from your scanner:"
-msgstr ""
+msgstr "So scannen Sie ein Dokument mit dem Scanner ein:"
 
 #. (itstool) path: item/p
 #: C/scanning.page:16
 msgid "Connect the scanner to your computer and power it on."
-msgstr ""
+msgstr "Schließen Sie den Scanner an Ihren Rechner an und schalten ihn ein."
 
 #. (itstool) path: item/p
 #: C/scanning.page:17
@@ -713,13 +822,18 @@ msgid ""
 "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>."
 msgstr ""
+"Klicken Sie auf den Pfeil rechts neben dem <gui>Scannen</gui>-Knopf und "
+"wählen Sie den gewünschten Dokumenttyp aus: <gui>Foto</gui> oder <gui>Text</"
+"gui>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:21
 msgid ""
-"Click the \"Scan\" button on the toolbar (or press "
-"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
+"Click the \"Scan\" button on the toolbar (or press <keyseq><key>Ctrl</"
+"key><key>1</key></keyseq>)."
 msgstr ""
+"Klicken Sie auf den <gui>Scannen</gui>-Knopf in der Werkzeugleiste (oder "
+"drücken Sie <keyseq><key>Strg</key><key>1</key></keyseq>)."
 
 #. (itstool) path: note/p
 #: C/scanning.page:24
@@ -728,13 +842,21 @@ msgid ""
 "the <key>Esc</key> key on the keyboard. Each page you scan is placed at the "
 "end of the document."
 msgstr ""
+"Die Seite wird so angezeigt, wie sie eingescannt wird. Um den Scanvorgang "
+"abzubrechen, können Sie jederzeit <key>Esc</key> drücken. Jede eingescannte "
+"Seite wird am Ende des Dokuments angefügt."
 
 #. (itstool) path: page/p
 #: C/scanning.page:29
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr ""
+"Den Dokumenttyp können Sie auch im Menü <guiseq><gui>Dokument</gui> "
+"<gui>Scannen</gui></guiseq> ändern. Wählen Sie <gui>Text</gui>, wenn das "
+"Dokument schnell in Schwarzweiß eingescannt werden soll, oder <gui>Foto</"
+"gui> für einen Farbscan in höherer Auflösung. In <link xref=\"dpi\"/> finden "
+"Sie Details und weitere Optionen."
diff --git a/help/de/de.stamp b/help/de/de.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/de/de.stamp
+++ /dev/null
diff --git a/help/de/dpi.page b/help/de/dpi.page
deleted file mode 100644
index 957d793..0000000
--- a/help/de/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scan-Auflösung einstellen</title>
-
-    <p>
-    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
deleted file mode 100644
index c2d06f8..0000000
--- a/help/de/email.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Per E-Mail versenden</title>
-
-    <p>Um das Dokument per E-Mail zu versenden, bitte im Menü <guiseq><gui>Dokument</gui><gui>E-Mail</gui></guiseq> öffnen (<keyseq><key>Strg</key><key>E</key></keyseq>). Dadurch wird Ihr E-Mail-Programm mit einer neuen Nachricht geöffnet, die das eingelesene Dokument als Anhang enthält.</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>
-    See <link xref="save"/> for more information about file formats.
-    </p>
-</page>
diff --git a/help/de/figures/preferences.png b/help/de/figures/preferences.png
new file mode 100644
index 0000000..0da9419
--- /dev/null
+++ b/help/de/figures/preferences.png
diff --git a/help/de/figures/scan_toolbar.png b/help/de/figures/scan_toolbar.png
new file mode 100644
index 0000000..abd5d0a
--- /dev/null
+++ b/help/de/figures/scan_toolbar.png
diff --git a/help/de/index.page b/help/de/index.page
deleted file mode 100644
index aca946d..0000000
--- a/help/de/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="de">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Seiten scannen</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Dokument anpassen</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Dokument verwenden</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/de/legal.xml b/help/de/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/de/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/de/print.page b/help/de/print.page
deleted file mode 100644
index a2c1dce..0000000
--- a/help/de/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Drucken</title>
-
-    <p>
-    <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/quality.page b/help/de/quality.page
deleted file mode 100644
index 8c916e3..0000000
--- a/help/de/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/de/reorder.page b/help/de/reorder.page
deleted file mode 100644
index d2f8ae4..0000000
--- a/help/de/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Seiten neu anordnen</title>
-
-    <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>
-    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
deleted file mode 100644
index d717c54..0000000
--- a/help/de/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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
deleted file mode 100644
index 6ce7c83..0000000
--- a/help/de/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Speichern in einer Datei</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/de/scanner.page b/help/de/scanner.page
deleted file mode 100644
index 48667fc..0000000
--- a/help/de/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Einen Scanner wählen</title>
-
-    <p>
-    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 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
deleted file mode 100644
index 281e810..0000000
--- a/help/de/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="de">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Eine Seite scannen</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Öffnen Sie <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>
-
-    <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>
-      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/en_GB/adf.page b/help/en_GB/adf.page
deleted file mode 100644
index 8226ed0..0000000
--- a/help/en_GB/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Using an Automatic Document Feeder</title>
-
-    <p>
-    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 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/en_GB/brightness-contrast.page b/help/en_GB/brightness-contrast.page
deleted file mode 100644
index 11bb0bb..0000000
--- a/help/en_GB/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/en_GB/crop.page b/help/en_GB/crop.page
deleted file mode 100644
index 5557055..0000000
--- a/help/en_GB/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Cropping</title>
-
-    <p>
-    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/en_GB/dpi.page b/help/en_GB/dpi.page
deleted file mode 100644
index 3f430f4..0000000
--- a/help/en_GB/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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/en_GB/email.page b/help/en_GB/email.page
deleted file mode 100644
index ca85840..0000000
--- a/help/en_GB/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Sending via E-mail</title>
-
-    <p>To e-mail the current document, use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your e-mail 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>See <link xref="save"/> for more information about file formats.</p>
-</page>
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index e529c22..4191f71 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2013-04-02 20:45+0000\n"
 "Last-Translator: Anthony Harrington 😁 <untaintableangel@ubuntu.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: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Anthony Harrington 😁 https://launchpad.net/~untaintableangel"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Scanning Pages"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Modifying the Document"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Using the Document"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -363,6 +317,52 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr "See <link xref=\"save\"/> for more information about file formats."
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Scanning Pages"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Modifying the Document"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Using the Document"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/en_GB/en_GB.stamp b/help/en_GB/en_GB.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/en_GB/en_GB.stamp
+++ /dev/null
diff --git a/help/en_GB/index.page b/help/en_GB/index.page
deleted file mode 100644
index c6248dc..0000000
--- a/help/en_GB/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="en-GB">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modifying the Document</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Using the Document</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/en_GB/legal.xml b/help/en_GB/legal.xml
deleted file mode 100644
index f5eff75..0000000
--- a/help/en_GB/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported Licence</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy, modify, and distribute the example code contained in this document under the terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/en_GB/print.page b/help/en_GB/print.page
deleted file mode 100644
index a23d671..0000000
--- a/help/en_GB/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Printing</title>
-
-    <p>
-    <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/en_GB/quality.page b/help/en_GB/quality.page
deleted file mode 100644
index 7cab7b2..0000000
--- a/help/en_GB/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/en_GB/reorder.page b/help/en_GB/reorder.page
deleted file mode 100644
index 99e3ecd..0000000
--- a/help/en_GB/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordering Pages</title>
-
-    <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>
-    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/en_GB/rotate.page b/help/en_GB/rotate.page
deleted file mode 100644
index 9ce1e87..0000000
--- a/help/en_GB/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/en_GB/save.page b/help/en_GB/save.page
deleted file mode 100644
index e3f48b6..0000000
--- a/help/en_GB/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Saving to a File</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/en_GB/scanner.page b/help/en_GB/scanner.page
deleted file mode 100644
index 271d569..0000000
--- a/help/en_GB/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="en-GB">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecting a Scanner</title>
-
-    <p>
-    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 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/en_GB/scanning.page b/help/en_GB/scanning.page
deleted file mode 100644
index ff6263f..0000000
--- a/help/en_GB/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="en-GB">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>To scan a document from your scanner:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer 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>
-
-    <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>
-      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/es/adf.page b/help/es/adf.page
deleted file mode 100644
index 9e1a343..0000000
--- a/help/es/adf.page
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Usar un alimentador automático de documentos</title>
-
-    <p>Si su escáner dispone de un alimentador automático de hojas (AAH) puede escanear todas las páginas del alimentador mediante alguno de los siguientes métodos:</p>
-      <steps>
-	<title/>
-	<title>Usar un atajo de teclado</title>
-	<item>
-	  <p>Pulsar <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
-	</item>      
-      </steps>
-      
-      <steps>
-	<title>Usar un menú</title>
-	<item>
-	  <p>Navegar a <guiseq><gui>Documento</gui> <gui>Escanear</gui><gui>Todas las páginas del alimentador</gui></guiseq>.</p>
-	</item>
-      </steps>
-      
-      <steps>
-	<title>Usar la barra de botones</title>
-	<item>
-	  <p>Pulsar en la flecha a la derecha del botón «Escanear».</p>
-	</item>
-	<item>
-	  <p>Elija «Todas las páginas del alimentador».</p>
-	  <media type="image" src="figures/scan_toolbar.png"/>
-	</item>
-      </steps>
-    
-    
-    <note style="tip">
-    <p>De forma predeterminada, se escanearán las dos caras de las hojas si el escáner tiene esta funcionalidad. Puede elegir escanear una sola cara en el menú <guiseq><gui>Documento</gui><gui>Preferencias</gui></guiseq>.</p>
-    <media type="image" src="figures/preferences.png"/>
-    </note>
-    
-</page>
diff --git a/help/es/brightness-contrast.page b/help/es/brightness-contrast.page
deleted file mode 100644
index 08c719d..0000000
--- a/help/es/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Establecer el brillo y el contraste</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/es/crop.page b/help/es/crop.page
deleted file mode 100644
index d26f648..0000000
--- a/help/es/crop.page
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Recorte</title>
-
-    <p>
-    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>Usar un clic del botón secundario</title>
-      <item><p>Haga clic con el botón secundario en cualquier parte de la imagen y seleccione «Cortar».</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>Usar un menú</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>Usar la barra de botones</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>Arrastre los bordes del marco para establecer las dimensiones y posición deseadas.</p></item>
-
-    </steps>
-    
-    <note><p>Cada nueva página escaneada usará el recorte previo.</p></note>
-</page>
diff --git a/help/es/dpi.page b/help/es/dpi.page
deleted file mode 100644
index c1e39e8..0000000
--- a/help/es/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Configurar la resolución del escaneo</title>
-
-    <p>
-    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>Resolución de texto</em></p></td>
-		<td><p><em>Resolución de fotos</em></p></td>
-	</tr>
-	<tr>
-		<td><p>75 ppp (borrador)</p></td>
-		<td><p>75 ppp (borrador)</p></td>
-	</tr>
-	<tr>
-		<td><p>150 ppp (predeterminado)</p></td>
-		<td><p>150 ppp</p></td>
-	</tr>
-	<tr>
-		<td><p>300 ppp</p></td>
-		<td><p>300 ppp (predeterminado)</p></td>
-	</tr>
-	<tr>
-		<td><p>600 ppp</p></td>
-		<td><p>600 ppp</p></td>
-	</tr>
-	<tr>
-		<td><p>1200 ppp (alta resolución)</p></td>
-		<td><p>1200 ppp (alta resolución)</p></td>
-	</tr>
-	<tr>
-		<td><p>2400 ppp</p></td>
-		<td><p>2400 ppp</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/es/email.page b/help/es/email.page
deleted file mode 100644
index b517ce3..0000000
--- a/help/es/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Enviar por correo electrónico</title>
-
-    <p>Para enviar por correo electrónico el documento actual utilice el menú <guiseq><gui>Documento</gui><gui>Correo electrónico</gui></guiseq> (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Se abrirá en su programa de correo electrónico un mensaje nuevo que contendrá el documento escaneado en forma de archivo adjunto.</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>Consulte <link xref="save"/> para más información sobre los formatos de archivo.</p>
-</page>
diff --git a/help/es/es.po b/help/es/es.po
index 4439783..14bf56e 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -2,77 +2,140 @@
 # 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.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2016-10-27 15:25+0000\n"
-"Last-Translator: Jose Luis Tirado <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2017-05-06 19:11+0000\n"
+"PO-Revision-Date: 2017-05-08 15:18+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+"Language-Team: es <gnome-es-list@gnome.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-23 05:24+0000\n"
+"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2017\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Adolfo Jayme https://launchpad.net/~fitojb\n"
 "  Jose Luis Tirado https://launchpad.net/~txelu70\n"
 "  calabero111 https://launchpad.net/~alfredorodriguez1011"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
+#. (itstool) path: page/title
+#: C/print.page:9
+msgid "Printing"
+msgstr "Imprimir"
 
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr "Ali Shtarbanov"
+#. (itstool) path: page/p
+#: C/print.page:11
+msgid ""
+"<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."
+msgstr ""
 
-#. (itstool) path: title/media
+#. (itstool) path: steps/title
+#: C/print.page:17
+msgid "To Print a Document"
+msgstr "Para imprimir un documento"
+
+#. (itstool) path: item/p
+#: C/print.page:19
+msgid ""
+"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."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/print.page:25
+msgid ""
+"From the \"Print\" dialog box choose your desired printing settings and/or "
+"Print Preview the document, then press the \"Print\" button."
+msgstr ""
+
+#. (itstool) path: info/title
+#: C/scanning.page:6
+msgctxt "sort"
+msgid "0"
+msgstr "0"
+
+#. (itstool) path: page/title
+#: C/scanning.page:10
+msgid "Scanning a Page"
+msgstr "Escanear una página"
+
+#. (itstool) path: page/p
+#: C/scanning.page:12
+msgid "To scan a document from your scanner:"
+msgstr "Para escanear un documento desde su escáner:"
+
+#. (itstool) path: item/p
+#: C/scanning.page:16
+msgid "Connect the scanner to your computer and power it on."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/scanning.page:17
+msgid "Open <app>Simple Scan</app>."
+msgstr "Abra <app>Simple Scan</app>."
+
+#. (itstool) path: item/p
+#: C/scanning.page:18
+msgid ""
+"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>."
+msgstr ""
+
+#. (itstool) path: item/media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
+#: C/scanning.page:20 C/adf.page:39
 msgctxt "_"
 msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+"external ref='figures/scan_toolbar.png' "
+"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 msgstr ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+"external ref='figures/scan_toolbar.png' "
+"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+#. (itstool) path: item/p
+#: C/scanning.page:21
+msgid ""
+"Click the \"Scan\" button on the toolbar (or press <keyseq><key>Ctrl</"
+"key><key>1</key></keyseq>)."
 msgstr ""
-"<media type=\"image\" src=\"figures/icon.png\"/> Manual de Simple Scan"
 
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Escanear páginas"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Modificar el documento"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Usar el documento"
+#. (itstool) path: note/p
+#: C/scanning.page:24
+msgid ""
+"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."
+msgstr ""
 
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr "Atajos de Simple Scan"
+#. (itstool) path: page/p
+#: C/scanning.page:29
+msgid ""
+"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."
+msgstr ""
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -100,9 +163,7 @@ msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
 msgstr "Pulsar <keyseq><key>Ctrl</key><key>F</key></keyseq>"
 
 #. (itstool) path: steps/title
-#: C/adf.page:24
-#: C/crop.page:27
-#: C/rotate.page:28
+#: C/adf.page:24 C/rotate.page:28 C/crop.page:27 C/delete.page:25
 msgid "Use a Menu"
 msgstr "Usar un menú"
 
@@ -118,7 +179,7 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/adf.page:33
 msgid "Use the Toolbar Buttons"
-msgstr "Usar la barra de botones"
+msgstr "Usar los botones de la barra de botones"
 
 #. (itstool) path: item/p
 #: C/adf.page:35
@@ -130,21 +191,6 @@ msgstr "Pulsar en la flecha a la derecha del botón «Escanear»."
 msgid "Choose \"All Pages From Feeder\"."
 msgstr "Elija «Todas las páginas del alimentador»."
 
-#. (itstool) path: item/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/adf.page:39
-#: C/scanning.page:20
-msgctxt "_"
-msgid ""
-"external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
-msgstr ""
-"external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
-
 #. (itstool) path: note/p
 #: C/adf.page:45
 msgid ""
@@ -162,9 +208,7 @@ msgstr ""
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:49
-#: C/dpi.page:16
-#: C/scanner.page:14
+#: C/adf.page:49 C/scanner.page:14 C/dpi.page:16
 msgctxt "_"
 msgid ""
 "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
@@ -172,101 +216,221 @@ msgstr ""
 "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
 
 #. (itstool) path: page/title
-#: C/brightness-contrast.page:9
-msgid "Setting brightness and Contrast"
-msgstr "Establecer el brillo y el contraste"
+#: C/rotate.page:9
+msgid "Rotating a Page"
+msgstr "Rotar una página"
 
 #. (itstool) path: page/p
-#: C/brightness-contrast.page:11
+#: C/rotate.page:11
 msgid ""
-"Some scanners allow the user to adjust the brightness and contrast when "
-"scanning. If your scans come out too dark or too light you can adjust these "
-"settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> "
-"menu."
+"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:"
 msgstr ""
 
-#. (itstool) path: page/title
-#: C/crop.page:9
-msgid "Cropping"
-msgstr "Recorte"
+#. (itstool) path: steps/title
+#: C/rotate.page:17
+msgid "Use Toolbar Buttons"
+msgstr "Usar botones de la barra de herramientas"
 
-#. (itstool) path: page/p
-#: C/crop.page:11
+#. (itstool) path: item/p
+#: C/rotate.page:18 C/rotate.page:29 C/rotate.page:35
+msgid "Select the page you want to rotate by clicking on it once."
+msgstr ""
+"Seleccione la página que quiere rotar haciendo clic sobre ella una vez."
+
+#. (itstool) path: item/p
+#: C/rotate.page:19
 msgid ""
-"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:"
+"Press one of the arrows on the toolbar to rotate the page in the desired "
+"direction."
 msgstr ""
 
 #. (itstool) path: steps/title
-#: C/crop.page:19
-msgid "Use a Right Click"
-msgstr "Usar un clic del botón secundario"
+#: C/rotate.page:22
+msgid "Use Right Click"
+msgstr ""
 
 #. (itstool) path: item/p
-#: C/crop.page:20
-msgid "Right click anywhere on the image area and select \"Crop\"."
+#: C/rotate.page:23
+msgid "Right click on the page you want to rotate."
 msgstr ""
-"Haga clic con el botón secundario en cualquier parte de la imagen y "
-"seleccione «Cortar»."
 
 #. (itstool) path: item/p
-#: C/crop.page:21
-msgid ""
-"Choose one of the fixed crop frames, or select \"Custom\" to manually set "
-"the crop frame's dimensions by dragging its borders."
+#: C/rotate.page:24
+msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
 msgstr ""
 
 #. (itstool) path: item/p
-#: C/crop.page:23
-#: C/crop.page:30
-msgid "Click and hold the frame, then move it to the desired position."
+#: C/rotate.page:30
+msgid "Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
 msgstr ""
 
+#. (itstool) path: steps/title
+#: C/rotate.page:34
+msgid "Use Shortcuts"
+msgstr "Usar atajos"
+
 #. (itstool) path: item/p
-#: C/crop.page:28
-msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
+#: C/rotate.page:36
+msgid "Press one of the following shortcut keys:"
+msgstr "Pulsar uno de los siguientes aceleradores de teclado:"
+
+#. (itstool) path: td/p
+#: C/rotate.page:39
+msgid "<em>Command</em>"
+msgstr "<em>Comando</em>"
+
+#. (itstool) path: td/p
+#: C/rotate.page:40
+msgid "<em>Shortcut Key</em>"
+msgstr "<em>Atajo</em>"
+
+#. (itstool) path: td/p
+#: C/rotate.page:43 C/shortcuts.page:86
+msgid "Rotate Left"
+msgstr "Rotar a la Izquierda"
+
+#. (itstool) path: td/p
+#: C/rotate.page:44
+msgid "<key>[</key> (left bracket)"
+msgstr "<key>[</key> (corchete izquierdo)"
+
+#. (itstool) path: td/p
+#: C/rotate.page:47 C/shortcuts.page:90
+msgid "Rotate Right"
+msgstr "Rotar a la Derecha"
+
+#. (itstool) path: td/p
+#: C/rotate.page:48
+msgid "<key>]</key> (right bracket)"
+msgstr "<key>]</key> (corchete derecho)"
+
+#. (itstool) path: note/p
+#: C/rotate.page:54
+msgid "Each new scanned page will use the previous rotation."
 msgstr ""
 
-#. (itstool) path: item/p
-#: C/crop.page:29
+#. (itstool) path: page/title
+#: C/quality.page:9
+msgid "Setting the Image Quality"
+msgstr "Establecer la calidad de la imagen"
+
+#. (itstool) path: page/p
+#: C/quality.page:11
 msgid ""
-"Choose one of the fixed crop frames, or select \"Custom\" to manually adjust "
-"the frame's dimensions by dragging its borders."
+"You can adjust the image quality that is used when the scan is converted to "
+"a file by changing this setting in the <guiseq><gui>Document</"
+"gui><gui>Preferences</gui></guiseq> menu. Using a low quality will result in "
+"a small file size but may show some blurring or blockiness in the image. A "
+"high quality will keep all the scanned information but require a larger file "
+"size. See the <link href=\"https://en.wikipedia.org/wiki/Lossy_compression"
+"\">Lossy compression Wikipedia page</link> for more information."
 msgstr ""
 
-#. (itstool) path: steps/title
-#: C/crop.page:34
-msgid "Use the Toolbar"
-msgstr "Usar la barra de botones"
+#. (itstool) path: page/title
+#: C/brightness-contrast.page:9
+msgid "Setting brightness and Contrast"
+msgstr "Establecer el brillo y el contraste"
 
-#. (itstool) path: item/p
-#: C/crop.page:35
-msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
+#. (itstool) path: page/p
+#: C/brightness-contrast.page:11
+msgid ""
+"Some scanners allow the user to adjust the brightness and contrast when "
+"scanning. If your scans come out too dark or too light you can adjust these "
+"settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> "
+"menu."
 msgstr ""
+"Algunos escáneres permite al usuario ajustar el brillo y el contraste al "
+"escanear. Si sus escaneos resultan demasiado oscuros o demasiado claros "
+"puede ajustar estos parámetros desde el menú <guiseq><gui>Documento</"
+"gui><gui>Preferencias</gui></guiseq>."
 
-#. (itstool) path: note/p
-#: C/crop.page:36
+#. (itstool) path: page/title
+#: C/reorder.page:9
+msgid "Reordering Pages"
+msgstr "Reordenar páginas"
+
+#. (itstool) path: page/p
+#: C/reorder.page:11
 msgid ""
-"This is the same as choosing \"Custom\" in step 2 of the aforementioned "
-"methods."
+"To move a page, right click on it and choose <gui><em>Move Left</em></gui> "
+"or <gui><em>Move Right</em></gui>."
 msgstr ""
 
-#. (itstool) path: item/p
-#: C/crop.page:38
+#. (itstool) path: page/p
+#: C/reorder.page:16
 msgid ""
-"Drag the borders of the frame to set the desired dimensions and position."
+"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."
 msgstr ""
-"Arrastre los bordes del marco para establecer las dimensiones y posición "
-"deseadas."
 
-#. (itstool) path: note/p
-#: C/crop.page:42
-msgid "Each new scanned page will use the previous crop."
-msgstr "Cada nueva página escaneada usará el recorte previo."
+#. (itstool) path: page/title
+#: C/scanner.page:9
+msgid "Selecting a Scanner"
+msgstr "Seleccionar un escáner"
+
+#. (itstool) path: page/p
+#: C/scanner.page:11
+msgid ""
+"If you have multiple scanning devices you can change the selected device "
+"from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/scanner.page:15
+msgid ""
+"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."
+msgstr ""
+
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr "<media type=\"image\" src=\"figures/icon.png\"/> Manual de Simple Scan"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Escanear páginas"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Modificar el documento"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Usar el documento"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr "Atajos de Simple Scan"
 
 #. (itstool) path: page/title
 #: C/dpi.page:9
@@ -278,8 +442,8 @@ msgstr "Configurar la resolución del escaneo"
 msgid ""
 "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."
+"You can change these settings from the <guiseq><gui>Document</"
+"gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
 
 #. (itstool) path: page/p
@@ -288,6 +452,8 @@ msgid ""
 "The available scanning resolutions for both document types (Text and Photo) "
 "are the same and are listed in the following table:"
 msgstr ""
+"Las resoluciones de escaneo disponibles para ambos tipos de documentos "
+"(texto y fotos) son las mismas y se muestran en la siguiente tabla:"
 
 #. (itstool) path: td/p
 #: C/dpi.page:23
@@ -300,8 +466,7 @@ msgid "<em>Photo Resolution</em>"
 msgstr "<em>Resolución de fotos</em>"
 
 #. (itstool) path: td/p
-#: C/dpi.page:27
-#: C/dpi.page:28
+#: C/dpi.page:27 C/dpi.page:28
 msgid "75 dpi (draft)"
 msgstr "75 ppp (borrador)"
 
@@ -326,20 +491,17 @@ msgid "300 dpi (default)"
 msgstr "300 ppp (predeterminado)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:39
-#: C/dpi.page:40
+#: C/dpi.page:39 C/dpi.page:40
 msgid "600 dpi"
 msgstr "600 ppp"
 
 #. (itstool) path: td/p
-#: C/dpi.page:43
-#: C/dpi.page:44
+#: C/dpi.page:43 C/dpi.page:44
 msgid "1200 dpi (high resolution)"
 msgstr "1200 ppp (alta resolución)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:47
-#: C/dpi.page:48
+#: C/dpi.page:47 C/dpi.page:48
 msgid "2400 dpi"
 msgstr "2400 ppp"
 
@@ -352,230 +514,128 @@ msgid ""
 msgstr ""
 
 #. (itstool) path: page/title
-#: C/email.page:9
-msgid "Sending via Email"
-msgstr "Enviar por correo electrónico"
-
-#. (itstool) path: page/p
-#: C/email.page:11
-msgid ""
-"To email the current document use the "
-"<guiseq><gui>Document</gui><gui>Email</gui></guiseq> menu "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be "
-"opened with a new message containing the scanned document as an attachment."
-msgstr ""
-"Para enviar por correo electrónico el documento actual utilice el menú "
-"<guiseq><gui>Documento</gui><gui>Correo electrónico</gui></guiseq> "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Se abrirá en su programa de "
-"correo electrónico un mensaje nuevo que contendrá el documento escaneado en "
-"forma de archivo adjunto."
-
-#. (itstool) path: page/p
-#: C/email.page:16
-msgid ""
-"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."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/email.page:21
-msgid "See <link xref=\"save\"/> for more information about file formats."
-msgstr ""
-"Consulte <link xref=\"save\"/> para más información sobre los formatos de "
-"archivo."
-
-#. (itstool) path: p/link
-#: C/legal.xml:4
-msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
-msgstr "Licencia Creative Commons Atribución-Compartir Igual 3.0 genérica"
-
-#. (itstool) path: license/p
-#: C/legal.xml:3
-msgid "This work is licensed under a <_:link-1/>."
-msgstr "Este trabajo se encuentra bajo una <_:link-1/>."
-
-#. (itstool) path: license/p
-#: C/legal.xml:6
-msgid ""
-"As a special exception, the copyright holders give you permission to copy, "
-"modify, and distribute the example code contained in this document under the "
-"terms of your choosing, without restriction."
-msgstr ""
-"Como una excepción especial, los titulares de derechos de autor le permiten "
-"copiar, modificar y redistribuir el código de ejemplo contenido en este "
-"documento bajo los términos que prefiera, sin ninguna restricción."
-
-#. (itstool) path: page/title
-#: C/print.page:9
-msgid "Printing"
-msgstr "Imprimir"
+#: C/crop.page:9
+msgid "Cropping"
+msgstr "Recorte"
 
 #. (itstool) path: page/p
-#: C/print.page:11
+#: C/crop.page:11
 msgid ""
-"<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."
+"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:"
 msgstr ""
 
 #. (itstool) path: steps/title
-#: C/print.page:17
-msgid "To Print a Document"
-msgstr "Para imprimir un documento"
+#: C/crop.page:19 C/delete.page:12
+msgid "Use a Right Click"
+msgstr "Usar un clic del botón secundario"
 
 #. (itstool) path: item/p
-#: C/print.page:19
-msgid ""
-"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."
+#: C/crop.page:20
+msgid "Right click anywhere on the image area and select \"Crop\"."
 msgstr ""
+"Haga clic con el botón secundario en cualquier parte de la imagen y "
+"seleccione «Cortar»."
 
 #. (itstool) path: item/p
-#: C/print.page:25
-msgid ""
-"From the \"Print\" dialog box choose your desired printing settings and/or "
-"Print Preview the document, then press the \"Print\" button."
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/quality.page:9
-msgid "Setting the Image Quality"
-msgstr "Establecer la calidad de la imagen"
-
-#. (itstool) path: page/p
-#: C/quality.page:11
-msgid ""
-"You can adjust the image quality that is used when the scan is converted to "
-"a file by changing this setting in the "
-"<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu. Using a low "
-"quality will result in a small file size but may show some blurring or "
-"blockiness in the image. A high quality will keep all the scanned "
-"information but require a larger file size. See the <link "
-"href=\"https://en.wikipedia.org/wiki/Lossy_compression\">Lossy compression "
-"Wikipedia page</link> for more information."
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/reorder.page:9
-msgid "Reordering Pages"
-msgstr "Reordenar páginas"
-
-#. (itstool) path: page/p
-#: C/reorder.page:11
-msgid ""
-"To move a page, right click on it and choose <gui><em>Move Left</em></gui> "
-"or <gui><em>Move Right</em></gui>."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/reorder.page:16
-msgid ""
-"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."
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/rotate.page:9
-msgid "Rotating a Page"
-msgstr "Rotar una página"
-
-#. (itstool) path: page/p
-#: C/rotate.page:11
+#: C/crop.page:21
 msgid ""
-"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:"
+"Choose one of the fixed crop frames, or select \"Custom\" to manually set "
+"the crop frame's dimensions by dragging its borders."
 msgstr ""
+"Elija uno de los marcos de recorte fijos o seleccione «Personalizado» para "
+"establecer manualmente las dimensiones del marco de recorte tirando de sus "
+"bordes."
 
-#. (itstool) path: steps/title
-#: C/rotate.page:17
-msgid "Use Toolbar Buttons"
-msgstr ""
+#. (itstool) path: item/p
+#: C/crop.page:23 C/crop.page:30
+msgid "Click and hold the frame, then move it to the desired position."
+msgstr "Haga clic y mantenga en el marco y luego muéval a la posición deseada."
 
 #. (itstool) path: item/p
-#: C/rotate.page:18
-#: C/rotate.page:29
-#: C/rotate.page:35
-msgid "Select the page you want to rotate by clicking on it once."
-msgstr ""
-"Seleccione la página que quiere rotar haciendo clic sobre ella una vez."
+#: C/crop.page:28
+msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
+msgstr "Navegue al menú <guiseq><gui>Página</gui><gui>Recortar</gui></guiseq>."
 
 #. (itstool) path: item/p
-#: C/rotate.page:19
+#: C/crop.page:29
 msgid ""
-"Press one of the arrows on the toolbar to rotate the page in the desired "
-"direction."
+"Choose one of the fixed crop frames, or select \"Custom\" to manually adjust "
+"the frame's dimensions by dragging its borders."
 msgstr ""
+"Elija uno de los marcos de recorte fijos o seleccione «Personalizado» para "
+"establecer manualmente las dimensiones del marco de recorte tirando de sus "
+"bordes."
 
 #. (itstool) path: steps/title
-#: C/rotate.page:22
-msgid "Use Right Click"
-msgstr ""
+#: C/crop.page:34
+msgid "Use the Toolbar"
+msgstr "Usar la barra de botones"
 
 #. (itstool) path: item/p
-#: C/rotate.page:23
-msgid "Right click on the page you want to rotate."
-msgstr ""
+#: C/crop.page:35
+msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
+msgstr "Pulse el botón «<gui>Recortar</gui>» en la barra de botones."
 
-#. (itstool) path: item/p
-#: C/rotate.page:24
-msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
+#. (itstool) path: note/p
+#: C/crop.page:36
+msgid ""
+"This is the same as choosing \"Custom\" in step 2 of the aforementioned "
+"methods."
 msgstr ""
+"Esto es lo mismo que seleccionar «Personalizado» en el paso 2 de los métodos "
+"anteriormente mencionados."
 
 #. (itstool) path: item/p
-#: C/rotate.page:30
+#: C/crop.page:38
 msgid ""
-"Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
+"Drag the borders of the frame to set the desired dimensions and position."
 msgstr ""
+"Arrastre los bordes del marco para establecer las dimensiones y posición "
+"deseadas."
 
-#. (itstool) path: steps/title
-#: C/rotate.page:34
-msgid "Use Shortcuts"
-msgstr "Usar atajos"
+#. (itstool) path: note/p
+#: C/crop.page:42
+msgid "Each new scanned page will use the previous crop."
+msgstr "Cada nueva página escaneada usará el recorte previo."
 
-#. (itstool) path: item/p
-#: C/rotate.page:36
-msgid "Press one of the following shortcut keys:"
-msgstr "Pulsar uno de los siguientes aceleradores de teclado:"
+#. (itstool) path: page/title
+#: C/email.page:9
+msgid "Sending via Email"
+msgstr "Enviar por correo electrónico"
 
-#. (itstool) path: td/p
-#: C/rotate.page:39
-msgid "<em>Command</em>"
+#. (itstool) path: page/p
+#: C/email.page:11
+msgid ""
+"To email the current document use the <guiseq><gui>Document</gui><gui>Email</"
+"gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your "
+"email program will be opened with a new message containing the scanned "
+"document as an attachment."
 msgstr ""
+"Para enviar por correo electrónico el documento actual utilice el menú "
+"<guiseq><gui>Documento</gui><gui>Correo electrónico</gui></guiseq> "
+"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Se abrirá en su programa de "
+"correo electrónico un mensaje nuevo que contendrá el documento escaneado en "
+"forma de archivo adjunto."
 
-#. (itstool) path: td/p
-#: C/rotate.page:40
-msgid "<em>Shortcut Key</em>"
+#. (itstool) path: page/p
+#: C/email.page:16
+msgid ""
+"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."
 msgstr ""
 
-#. (itstool) path: td/p
-#: C/rotate.page:43
-msgid "Rotate Left"
-msgstr "Rotar a la Izquierda"
-
-#. (itstool) path: td/p
-#: C/rotate.page:44
-msgid "<key>[</key> (left bracket)"
-msgstr "<key>[</key> (corchete izquierdo)"
-
-#. (itstool) path: td/p
-#: C/rotate.page:47
-msgid "Rotate Right"
-msgstr "Rotar a la Derecha"
-
-#. (itstool) path: td/p
-#: C/rotate.page:48
-msgid "<key>]</key> (right bracket)"
-msgstr "<key>]</key> (corchete derecho)"
-
-#. (itstool) path: note/p
-#: C/rotate.page:54
-msgid "Each new scanned page will use the previous rotation."
+#. (itstool) path: page/p
+#: C/email.page:21
+msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
+"Consulte <link xref=\"save\"/> para más información sobre los formatos de "
+"archivo."
 
 #. (itstool) path: page/title
 #: C/save.page:9
@@ -645,10 +705,9 @@ msgid ""
 "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. The size of the JPEG file is affected by the <link "
-"xref=\"quality\">image quality</link>. See the <link "
-"href=\"http://en.wikipedia.org/wiki/jpeg\">JPEG Wikipedia page</link> for "
-"more information."
+"the scanned images. The size of the JPEG file is affected by the <link xref="
+"\"quality\">image quality</link>. See the <link href=\"http://en.wikipedia."
+"org/wiki/jpeg\">JPEG Wikipedia page</link> for more information."
 msgstr ""
 
 #. (itstool) path: td/p
@@ -661,9 +720,9 @@ msgstr "PNG"
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Portable_Network_Graphics\">PNG Wikipedia page</link> for more "
+"information."
 msgstr ""
 
 #. (itstool) path: td/p
@@ -676,86 +735,312 @@ msgstr "TIFF"
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Tagged_Image_File_Format\">TIFF Wikipedia page</link> for more "
+"information."
 msgstr ""
 
 #. (itstool) path: page/title
-#: C/scanner.page:9
-msgid "Selecting a Scanner"
-msgstr "Seleccionar un escáner"
+#: C/external.page:9
+msgid "Externally View a Page"
+msgstr ""
 
 #. (itstool) path: page/p
-#: C/scanner.page:11
+#: C/external.page:11
 msgid ""
-"If you have multiple scanning devices you can change the selected device "
-"from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
+"Double click a scanned page to view it with your default image viewer. This "
+"action creates a TIFF file containing the raw data from the scanner in your /"
+"tmp directory named \"<em>scanned-pageXXXXXX.tiff</em>\"."
 msgstr ""
 
 #. (itstool) path: page/p
-#: C/scanner.page:15
+#: C/external.page:16
 msgid ""
-"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."
+"If you double click the scanned page after crop is enabled, only the cropped "
+"part will open. You can, therefore, use this feature to check more "
+"accurately whether you have positioned the crop frame exactly where you "
+"wanted it."
 msgstr ""
 
-#. (itstool) path: info/title
-#: C/scanning.page:6
-msgctxt "sort"
-msgid "0"
-msgstr "0"
-
 #. (itstool) path: page/title
-#: C/scanning.page:10
-msgid "Scanning a Page"
-msgstr "Escanear una página"
+#: C/delete.page:9
+#| msgid "Rotating a Page"
+msgid "Deleting a Page"
+msgstr "Eliminar una página"
 
-#. (itstool) path: page/p
-#: C/scanning.page:12
-msgid "To scan a document from your scanner:"
-msgstr "Para escanear un documento desde su escáner:"
+#. (itstool) path: item/p
+#: C/delete.page:13
+#, fuzzy
+#| msgid "Right click anywhere on the image area and select \"Crop\"."
+msgid "Right click on the page you want to delete."
+msgstr ""
+"Haga clic con el botón secundario en cualquier parte de la imagen y "
+"seleccione «Cortar»."
 
 #. (itstool) path: item/p
-#: C/scanning.page:16
-msgid "Connect the scanner to your computer and power it on."
+#: C/delete.page:14
+msgid "Choose \"Delete\" from the context menu."
 msgstr ""
 
+#. (itstool) path: steps/title
+#: C/delete.page:18
+#, fuzzy
+#| msgid "Use Shortcuts"
+msgid "Use a Shortcut Key"
+msgstr "Usar atajos"
+
 #. (itstool) path: item/p
-#: C/scanning.page:17
-msgid "Open <app>Simple Scan</app>."
-msgstr "Abra <app>Simple Scan</app>."
+#: C/delete.page:19 C/delete.page:26
+#, fuzzy
+#| msgid "Select the page you want to rotate by clicking on it once."
+msgid "Select the page you want to delete (by clicking on it once)."
+msgstr ""
+"Seleccione la página que quiere rotar haciendo clic sobre ella una vez."
 
 #. (itstool) path: item/p
-#: C/scanning.page:18
-msgid ""
-"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>."
+#: C/delete.page:20
+msgid "Press the <key>Delete</key> key on the keyboard."
 msgstr ""
 
 #. (itstool) path: item/p
-#: C/scanning.page:21
-msgid ""
-"Click the \"Scan\" button on the toolbar (or press "
-"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
+#: C/delete.page:27
+msgid "Go to the \"Page\" menu and click \"Delete\"."
 msgstr ""
 
 #. (itstool) path: note/p
-#: C/scanning.page:24
-msgid ""
-"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."
+#: C/delete.page:30
+msgid "WARNING: The deletion of a page cannot be undone!"
 msgstr ""
 
-#. (itstool) path: page/p
-#: C/scanning.page:29
-msgid ""
-"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."
+#. (itstool) path: page/title
+#: C/shortcuts.page:9
+#| msgid "Use a Keyboard Shortcut"
+msgid "Keyboard Shortcuts"
+msgstr "Atajo del teclado"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:13
+#| msgid "Use Shortcuts"
+msgid "Shortcut"
+msgstr "Atajo"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:14
+msgid "Description"
+msgstr "Descripción"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:17
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Alt</key><key>D</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>D</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:18
+msgid "Document menu"
+msgstr "Menú del documento"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:21
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Alt</key><key>H</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>H</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:22
+msgid "Help menu"
+msgstr "Menú de Ayuda"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:25
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Alt</key><key>P</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>P</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:26
+msgid "Page menu"
+msgstr "Menú de página"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:29
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Alt</key><key>F4</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>F4</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:30
+#| msgid "Open <app>Simple Scan</app>."
+msgid "Close <app>Simple Scan</app>"
+msgstr "Cierre <app>Simple Scan</app>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:33
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key>1</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>1</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:34
+#, fuzzy
+#| msgid "Scanning Pages"
+msgid "Scan a single page"
+msgstr "Escanear páginas"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:37
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:38
+#, fuzzy
+#| msgid "Using the Document"
+msgid "Email the document"
+msgstr "Usar el documento"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:41
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:42
+#, fuzzy
+#| msgid "To Print a Document"
+msgid "Start a new document"
+msgstr "Para imprimir un documento"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:45
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key>P</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>P</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:46
+msgid "Open the Print dialog box"
 msgstr ""
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:49
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:50
+#| msgid "Open <app>Simple Scan</app>."
+msgid "Quit <app>Simple Scan</app>"
+msgstr "Salir de <app>Simple Scan</app>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:53
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:54
+msgid "Save"
+msgstr "Guardar"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:57
+#| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Mayús</key><key>S</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:58
+msgid "Save As"
+msgstr "Guardar como"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:61
+msgid "<key>Delete</key>"
+msgstr "<key>Supr</key>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:62
+msgid "Delete selected page"
+msgstr "Eliminar la página seleccionada"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:65
+msgid "<key>End</key>"
+msgstr "<key>Fin</key>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:66
+msgid "Select the last page of the document"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:69
+msgid "<key>Esc</key>"
+msgstr "<key>Esc</key>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:70
+msgid "Stop the current scan"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:73
+msgid "<key>F1</key>"
+msgstr "<key>F1</key>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:74
+msgid "Help"
+msgstr "Ayuda"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:77
+msgid "<key>F10</key>"
+msgstr "<key>F10</key>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:78
+msgid "Document Menu (open/close)"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:81
+msgid "<key>Home</key>"
+msgstr "<key>Inicio</key>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:82
+msgid "Select the first page of the document"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:85
+#| msgid "<key>[</key> (left bracket)"
+msgid "<key>[</key>"
+msgstr "<key>[</key>"
+
+#. (itstool) path: td/p
+#: C/shortcuts.page:89
+#| msgid "<key>]</key> (right bracket)"
+msgid "<key>]</key>"
+msgstr "<key>]</key>"
+
+#~ msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
+#~ msgstr "Licencia Creative Commons Atribución-Compartir Igual 3.0 genérica"
+
+#~ msgid "This work is licensed under a <_:link-1/>."
+#~ msgstr "Este trabajo se encuentra bajo una <_:link-1/>."
+
+#~ msgid ""
+#~ "As a special exception, the copyright holders give you permission to "
+#~ "copy, modify, and distribute the example code contained in this document "
+#~ "under the terms of your choosing, without restriction."
+#~ msgstr ""
+#~ "Como una excepción especial, los titulares de derechos de autor le "
+#~ "permiten copiar, modificar y redistribuir el código de ejemplo contenido "
+#~ "en este documento bajo los términos que prefiera, sin ninguna restricción."
diff --git a/help/es/es.stamp b/help/es/es.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/es/es.stamp
+++ /dev/null
diff --git a/help/es/index.page b/help/es/index.page
deleted file mode 100644
index 1950447..0000000
--- a/help/es/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="es">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Manual de Simple Scan</title>
-    
-    <section id="acquire" style="2column">
-        <title>Escanear páginas</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modificar el documento</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Usar el documento</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Atajos de Simple Scan</title>
-    </section>
-</page>
diff --git a/help/es/legal.xml b/help/es/legal.xml
deleted file mode 100644
index 9c1e6e8..0000000
--- a/help/es/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Este trabajo se encuentra bajo una <link href="http://creativecommons.org/licenses/by-sa/3.0/">Licencia Creative Commons Atribución-Compartir Igual 3.0 genérica</link>.</p>
-<p>Como una excepción especial, los titulares de derechos de autor le permiten copiar, modificar y redistribuir el código de ejemplo contenido en este documento bajo los términos que prefiera, sin ninguna restricción.</p>
-</license>
diff --git a/help/es/print.page b/help/es/print.page
deleted file mode 100644
index 822efad..0000000
--- a/help/es/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Imprimir</title>
-
-    <p>
-    <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>Para imprimir un documento</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/es/quality.page b/help/es/quality.page
deleted file mode 100644
index 00ed492..0000000
--- a/help/es/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Establecer la calidad de la imagen</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/es/reorder.page b/help/es/reorder.page
deleted file mode 100644
index 6cc8aaa..0000000
--- a/help/es/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordenar páginas</title>
-
-    <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>
-    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/es/rotate.page b/help/es/rotate.page
deleted file mode 100644
index 9188ef8..0000000
--- a/help/es/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotar una página</title>
-
-    <p>
-    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>Seleccione la página que quiere rotar haciendo clic sobre ella una vez.</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>Usar un menú</title>
-      <item><p>Seleccione la página que quiere rotar haciendo clic sobre ella una vez.</p></item>
-      <item><p>Click the "Page" menu and select "Rotate Left" or "Rotate Right".</p></item>
-    </steps>
-    
-    <steps>
-      <title>Usar atajos</title>
-      <item><p>Seleccione la página que quiere rotar haciendo clic sobre ella una vez.</p></item>
-      <item><p>Pulsar uno de los siguientes aceleradores de teclado:</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>Rotar a la Izquierda</p></td>
-		<td><p><key>[</key> (corchete izquierdo)</p></td>
-	</tr>
-	<tr>
-		<td><p>Rotar a la Derecha</p></td>
-		<td><p><key>]</key> (corchete derecho)</p></td>
-	</tr>
-	</table>
-      </item>
-    </steps>
-    
-    <note><p>
-    Each new scanned page will use the previous rotation.
-    </p></note>
-</page>
diff --git a/help/es/save.page b/help/es/save.page
deleted file mode 100644
index a3d3b96..0000000
--- a/help/es/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Guardar a un archivo</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Pulsar el botón «Guardar».</p>
-      </item>
-    </steps>
-    
-    
-<table frame="bottom left right top" rules="rows cols" shade="rows">
-	<title>Tipos de archivos soportados</title>
-	<tr>
-		<td><p><em>Tipo</em></p></td>
-		<td><p><em>Breve descripción</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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/es/scanner.page b/help/es/scanner.page
deleted file mode 100644
index b243fd2..0000000
--- a/help/es/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Seleccionar un escáner</title>
-
-    <p>
-    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 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/es/scanning.page b/help/es/scanning.page
deleted file mode 100644
index 5cdd5b4..0000000
--- a/help/es/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="es">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Escanear una página</title>
-
-    <p>Para escanear un documento desde su escáner:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Abra <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>
-
-    <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>
-      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/eu/adf.page b/help/eu/adf.page
deleted file mode 100644
index 70de90a..0000000
--- a/help/eu/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Dokumentu-elikadura automatikoa erabiltzea</title>
-
-    <p>
-    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 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/eu/brightness-contrast.page b/help/eu/brightness-contrast.page
deleted file mode 100644
index b19b54b..0000000
--- a/help/eu/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/eu/crop.page b/help/eu/crop.page
deleted file mode 100644
index 6914532..0000000
--- a/help/eu/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Moztea</title>
-
-    <p>
-    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/eu/dpi.page b/help/eu/dpi.page
deleted file mode 100644
index 6324512..0000000
--- a/help/eu/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Eskaneatzearen bereizmena ezartzea</title>
-
-    <p>
-    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/eu/email.page b/help/eu/email.page
deleted file mode 100644
index 0b2aa35..0000000
--- a/help/eu/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Postaz bidaltzea</title>
-
-    <p>Uneko dokumentua postaz bidaltzeko, erabili <guiseq><gui>Dokumentua</gui><gui>Posta</gui></guiseq> menua (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Posta elektronikoko zure programa irekiko da, eskaneatutako dokumentua erantsita duen mezu berri bat erakutsiz.</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>Ikus <link xref="save"/> fitxategi-formatuei buruzko informazio gehiagorako.</p>
-</page>
diff --git a/help/eu/eu.po b/help/eu/eu.po
index 6c4afcc..1d72bb2 100644
--- a/help/eu/eu.po
+++ b/help/eu/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2012-09-28 23:55+0000\n"
 "Last-Translator: Asier Sarasua Garmendia <Unknown>\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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Asier Sarasua Garmendia https://launchpad.net/~asarasuagarmendia"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Orrialdeak eskaneatzea"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Dokumentua moldatzea"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Dokumentua erabiltzea"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -366,6 +320,52 @@ msgstr ""
 "Ikus <link xref=\"save\"/> fitxategi-formatuei buruzko informazio "
 "gehiagorako."
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Orrialdeak eskaneatzea"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Dokumentua moldatzea"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Dokumentua erabiltzea"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/eu/eu.stamp b/help/eu/eu.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/eu/eu.stamp
+++ /dev/null
diff --git a/help/eu/index.page b/help/eu/index.page
deleted file mode 100644
index 9ef78d3..0000000
--- a/help/eu/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="eu">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Orrialdeak eskaneatzea</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Dokumentua moldatzea</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Dokumentua erabiltzea</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/eu/legal.xml b/help/eu/legal.xml
deleted file mode 100644
index 5dd2caa..0000000
--- a/help/eu/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Lan honen lizentzia <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</link> da.</p>
-<p>Salbuespen berezi gisa, copyright jabeek baimena ematen dizute dokumentu honetan dagoen kodea kopiatu, aldatu eta banatzeko zuk aukeratzen duzun lizentziaren arabera, inolako mugarik gabe.</p>
-</license>
diff --git a/help/eu/print.page b/help/eu/print.page
deleted file mode 100644
index 7868fa2..0000000
--- a/help/eu/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Inprimatzea</title>
-
-    <p>
-    <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/eu/quality.page b/help/eu/quality.page
deleted file mode 100644
index 9c66e97..0000000
--- a/help/eu/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/eu/reorder.page b/help/eu/reorder.page
deleted file mode 100644
index 18e4136..0000000
--- a/help/eu/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Orrialdeen ordenatzea</title>
-
-    <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>
-    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/eu/rotate.page b/help/eu/rotate.page
deleted file mode 100644
index e8fa4bd..0000000
--- a/help/eu/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/eu/save.page b/help/eu/save.page
deleted file mode 100644
index dd6008a..0000000
--- a/help/eu/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Fitxategi batean gordetzea</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/eu/scanner.page b/help/eu/scanner.page
deleted file mode 100644
index 6849ee3..0000000
--- a/help/eu/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="eu">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Eskanerra hautatzea</title>
-
-    <p>
-    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 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/eu/scanning.page b/help/eu/scanning.page
deleted file mode 100644
index bfdf9aa..0000000
--- a/help/eu/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="eu">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Orrialdea eskaneatzea</title>
-
-    <p>Zure eskanerrarekin dokumentu bat eskaneatzeko:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Ireki <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>
-
-    <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>
-      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/fi/adf.page b/help/fi/adf.page
deleted file mode 100644
index 2c6a607..0000000
--- a/help/fi/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Using an Automatic Document Feeder</title>
-
-    <p>
-    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 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/fi/brightness-contrast.page b/help/fi/brightness-contrast.page
deleted file mode 100644
index 1322941..0000000
--- a/help/fi/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/fi/crop.page b/help/fi/crop.page
deleted file mode 100644
index 8dcf611..0000000
--- a/help/fi/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rajaus</title>
-
-    <p>
-    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/fi/dpi.page b/help/fi/dpi.page
deleted file mode 100644
index 37f8078..0000000
--- a/help/fi/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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/fi/email.page b/help/fi/email.page
deleted file mode 100644
index bdbad0f..0000000
--- a/help/fi/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Lähetys sähköpostia käyttäen</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/fi/fi.po b/help/fi/fi.po
index 229e445..869020f 100644
--- a/help/fi/fi.po
+++ b/help/fi/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2013-09-22 12:10+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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Jiri Grönroos https://launchpad.net/~jiri-gronroos"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Asiakirjan muokkaaminen"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -359,6 +313,52 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Asiakirjan muokkaaminen"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/fi/fi.stamp b/help/fi/fi.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/fi/fi.stamp
+++ /dev/null
diff --git a/help/fi/index.page b/help/fi/index.page
deleted file mode 100644
index b2f0b36..0000000
--- a/help/fi/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="fi">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Asiakirjan muokkaaminen</title>
-    </section>
-
-    <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/fi/legal.xml b/help/fi/legal.xml
deleted file mode 100644
index 6e263c1..0000000
--- a/help/fi/legal.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Tämän työn kattaa <link href="http://creativecommons.org/licenses/by-sa/3.0/">Nimeä-Tarttuva 3.0 Muokkaamaton (CC BY-SA 3.0) -lisenssi</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/fi/print.page b/help/fi/print.page
deleted file mode 100644
index ec12db4..0000000
--- a/help/fi/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Tulostus</title>
-
-    <p>
-    <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/fi/quality.page b/help/fi/quality.page
deleted file mode 100644
index e7704b0..0000000
--- a/help/fi/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/fi/reorder.page b/help/fi/reorder.page
deleted file mode 100644
index 265f02a..0000000
--- a/help/fi/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Sivujen uudelleenjärjestely</title>
-
-    <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>
-    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/fi/rotate.page b/help/fi/rotate.page
deleted file mode 100644
index 4d1a517..0000000
--- a/help/fi/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/fi/save.page b/help/fi/save.page
deleted file mode 100644
index 175a7f2..0000000
--- a/help/fi/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Tiedostoon tallennus</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/fi/scanner.page b/help/fi/scanner.page
deleted file mode 100644
index e3bc3b2..0000000
--- a/help/fi/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="fi">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Kuvanlukijan valitseminen</title>
-
-    <p>
-    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 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/fi/scanning.page b/help/fi/scanning.page
deleted file mode 100644
index e264198..0000000
--- a/help/fi/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="fi">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Avaa <app>Kuvanluku</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>
-
-    <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>
-      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/fr/adf.page b/help/fr/adf.page
deleted file mode 100644
index 138dd1e..0000000
--- a/help/fr/adf.page
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Utilisation du chargeur automatique de documents</title>
-
-    <p>Si votre périphérique de numérisation propose un chargeur automatique de documents (ADF) vous pouvez numériser toutes les pages depuis le chargeur en suivant une des méthodes suivantes :</p>
-      <steps>
-	<title/>
-	<title>Utiliser un raccourci clavier</title>
-	<item>
-	  <p>Appuyez sur <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
-	</item>      
-      </steps>
-      
-      <steps>
-	<title>Utiliser un menu</title>
-	<item>
-	  <p>Naviguez vers <guiseq><gui>Document</gui> <gui>Numériser</gui><gui>Toutes les pages du chargeur</gui></guiseq>.</p>
-	</item>
-      </steps>
-      
-      <steps>
-	<title>Utiliser les boutons de la barre d'outils</title>
-	<item>
-	  <p>Cliquez sur la flèche à droite du bouton « Numériser ».</p>
-	</item>
-	<item>
-	  <p>Sélectionnez « Toutes les pages du chargeur »</p>
-	  <media type="image" src="figures/scan_toolbar.png"/>
-	</item>
-      </steps>
-    
-    
-    <note style="tip">
-    <p>Par défaut, les deux faces de la feuille seront numérisées si votre périphérique le permet. Vous pouvez choisir de ne numériser qu'une seule face depuis le menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>.</p>
-    <media type="image" src="figures/preferences.png"/>
-    </note>
-    
-</page>
diff --git a/help/fr/brightness-contrast.page b/help/fr/brightness-contrast.page
deleted file mode 100644
index 4dfc0e4..0000000
--- a/help/fr/brightness-contrast.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Réglage de la luminosité et du contraste</title>
-
-    <p>Certains périphériques de numérisation permettent à l'utilisateur d'ajuster la luminosité et le contraste durant la numérisation. Si vos numérisations sont trop sombres ou trop claires, vous pouvez régler ces paramètres à partir du menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>.</p>
-</page>
diff --git a/help/fr/crop.page b/help/fr/crop.page
deleted file mode 100644
index 9450bb3..0000000
--- a/help/fr/crop.page
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Recadrage</title>
-
-    <p>La fonction recadrage dans <app>Simple Scan</app> vous permet de n'utiliser qu'une partie d'une image numérisée. Vous pouvez activer le recadrage avant ou après la numérisation d'une page et vous pouvez toujours changer les dimensions du recadrage. Lorsque le recadrage est activé, un masque apparaîtra sur la page en cours, la zone non utilisée sera grisée. Vous pouvez activer le recadrage et choisir les dimensions souhaitées via l'une des méthodes suivantes :</p>
-    
-    <steps>
-      <title>Utilisez un clic droit</title>
-      <item><p>Faites un clic droit à n'importe quel endroit de la page et sélectionnez « Recadrer ».</p></item>
-      <item><p>Sélectionnez un des cadres fixes ou sélectionnez « Personnalisé » pour définir manuellement les dimensions du cadre en faisant glisser ses bords.</p></item>
-      <item><p>Cliquez et maintenez le cadre, puis déplacez-le sur la position désirée.</p></item>
-    </steps>
-    
-    <steps>
-      <title>Utiliser un menu</title>
-      <item><p>Naviguez vers le menu <guiseq><gui>Page</gui><gui>Recadrer</gui></guiseq>.</p></item>
-      <item><p>Sélectionnez un des cadres fixes ou sélectionnez « Personnalisé » pour définir manuellement les dimensions du cadre en faisant glisser ses bords.</p></item>
-      <item><p>Cliquez et maintenez le cadre, puis déplacez-le sur la position désirée.</p></item>
-    </steps>
-    
-    <steps>
-      <title>Utiliser la barre d'outils</title>
-      <item><p>Cliquez sur le bouton « <gui>Recadrer</gui> » dans la barre d'outils.</p>
-	    <note style="tip"><p>Ceci revient au même que de choisir « Personnalisé » à l'étape 2 des méthodes mentionnées ci-dessus.</p></note></item>      
-      <item><p>Faites glisser les bords du cadre pour définir les dimensions désirées et la position.</p></item>
-
-    </steps>
-    
-    <note><p>Chaque nouvelle page numérisée utilisera le recadrage précédent.</p></note>
-</page>
diff --git a/help/fr/dpi.page b/help/fr/dpi.page
deleted file mode 100644
index 7d42540..0000000
--- a/help/fr/dpi.page
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Configuration de la résolution du périphérique de numérisation</title>
-
-    <p>La résolution par défaut pour un document <gui><em>Texte</em></gui> est de 150 ppp (points par pouce), pour un document <gui><em>Photo</em></gui>, elle est de 300 ppp. Vous pouvez modifier ces réglages dans le menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>.</p>
-    <media type="image" src="figures/preferences.png"/>
-    
-    <p>Les résolutions de numérisation disponibles pour les deux types de documents (textes et photos) sont les mêmes et sont listées dans le tableau suivant :</p>
-    
-    <table frame="bottom left right" rules="rows cols" shade="rows">
-	<tr>
-		<td><p><em>Résolution texte</em></p></td>
-		<td><p><em>Résolution photo</em></p></td>
-	</tr>
-	<tr>
-		<td><p>75 ppp (brouillon)</p></td>
-		<td><p>75 ppp (brouillon)</p></td>
-	</tr>
-	<tr>
-		<td><p>150 ppp (par défaut)</p></td>
-		<td><p>150 ppp</p></td>
-	</tr>
-	<tr>
-		<td><p>300 ppp</p></td>
-		<td><p>300 ppp (par défaut)</p></td>
-	</tr>
-	<tr>
-		<td><p>600 ppp</p></td>
-		<td><p>600 ppp</p></td>
-	</tr>
-	<tr>
-		<td><p>1200 ppp (haute résolution)</p></td>
-		<td><p>1200 ppp (haute résolution)</p></td>
-	</tr>
-	<tr>
-		<td><p>2400 ppp</p></td>
-		<td><p>2400 ppp</p></td>
-	</tr>
-    </table>
-    
-    <note style="important"><p>Les documents <gui><em>Texte</em></gui> sont toujours numérisés en noir et blanc alors que les documents <gui><em>Photo</em></gui> sont toujours numérisés en couleur, quelle que soit la résolution !</p>
-    </note>
-
-</page>
diff --git a/help/fr/email.page b/help/fr/email.page
deleted file mode 100644
index c8652af..0000000
--- a/help/fr/email.page
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Envoi par courriel</title>
-
-    <p>Pour envoyer le document actuel par courriel, choisissez le menu <guiseq><gui>Document</gui><gui>Courriel</gui></guiseq>(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Votre logiciel de messagerie électronique s'ouvrira avec un nouveau message qui contiendra le document numérisé en pièce jointe.</p>
-    <p>Si le type de document a été réglé sur « Texte » le courriel aura une pièce jointe PDF pour chaque page. À l'inverse, si le type de document a été réglé sur « Photo », le courriel aura une pièce jointe JPEG pour chaque page.</p>
-    <p>Consultez <link xref="save"/> pour plus d'information à propos des formats de fichiers.</p>
-</page>
diff --git a/help/fr/fr.po b/help/fr/fr.po
index e2dd5c0..3a01e6f 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-05-23 16:26+0000\n"
 "Last-Translator: Jean-Marc <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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -25,54 +25,6 @@ msgstr ""
 "  Jean-Marc https://launchpad.net/~m-balthazar\n"
 "  Pierre-Cyril https://launchpad.net/~jokaz-junk"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr "Ali Shtarbanov"
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-"<media type=\"image\" src=\"figures/icon.png\"/> Manuel de Simple Scan"
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Numérisation de pages"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Modification du document"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Utilisation du document"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr "Raccourcis de Simple Scan"
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -417,6 +369,54 @@ msgstr ""
 "Consultez <link xref=\"save\"/> pour plus d'information à propos des formats "
 "de fichiers."
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Manuel de Simple Scan"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Numérisation de pages"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Modification du document"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Utilisation du document"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr "Raccourcis de Simple Scan"
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/fr/fr.stamp b/help/fr/fr.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/fr/fr.stamp
+++ /dev/null
diff --git a/help/fr/index.page b/help/fr/index.page
deleted file mode 100644
index b28f7a3..0000000
--- a/help/fr/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="fr">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Manuel de Simple Scan</title>
-    
-    <section id="acquire" style="2column">
-        <title>Numérisation de pages</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modification du document</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Utilisation du document</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Raccourcis de Simple Scan</title>
-    </section>
-</page>
diff --git a/help/fr/legal.xml b/help/fr/legal.xml
deleted file mode 100644
index 25c8919..0000000
--- a/help/fr/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Ce travail est publié sous <link href="http://creativecommons.org/licenses/by-sa/3.0/">Licence Creative Commons Paternité - Partage à l'Identique 3.0 non transcrit (CC BY-SA 3.0)</link>.</p>
-<p>À titre exceptionnel, les détenteurs des droits vous donnent la permission de copier, modifier et distribuer le code contenu dans ce document sous les termes de votre choix, sans restrictions.</p>
-</license>
diff --git a/help/fr/print.page b/help/fr/print.page
deleted file mode 100644
index ddce904..0000000
--- a/help/fr/print.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Impression</title>
-
-    <p><app>Simple Scan</app> vous permet d'imprimer un document numérisé directement à partir de son interface, sans avoir à enregistrer le premier document. Cette caractéristique fait de <app>Simple Scan</app> un outil très pratique pour faire des copies de documents ou de photos.</p>
-    <steps>
-      <title>Pour imprimer un document</title>
-      <item>
-	<p>Allez dans le menu <guiseq><gui>Document</gui><gui>Imprimer</gui> </guiseq> ou utilisez le raccourci clavier <keyseq><key>Ctrl</key><key>P</key></keyseq>. Ceci ouvrira la boîte de dialogue « Imprimer ».</p>
-      </item>
-      <item>
-	<p>Depuis la boîte de dialogue « Imprimer » sélectionnez vos paramètres d'impression désirés et/ou prévisualisez le document puis cliquez sur le bouton « Imprimer ».</p>
-      </item>
-     </steps>
-</page>
diff --git a/help/fr/quality.page b/help/fr/quality.page
deleted file mode 100644
index 6ea1172..0000000
--- a/help/fr/quality.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Réglage de la qualité de l'image</title>
-
-    <p>Vous pouvez ajuster la qualité d'image utilisée lorsque la numérisation est convertie en fichier en changeant ce paramètre dans le menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>. L'utilisation d'une qualité moindre se traduira par une petite taille de fichier, mais pourra présenter un certain flou ou une pixellisation de l'image. Une qualité élevée permet de conserver toutes les informations numérisées, mais nécessite une taille de fichier plus volumineux. Consultez la <link href="https://fr.wikipedia.org/wiki/Compression_de_donn%C3%A9es#Compression_avec_pertes">page Wikipédia sur la compression de données</link> pour plus d'informations.</p>    
-</page>
diff --git a/help/fr/reorder.page b/help/fr/reorder.page
deleted file mode 100644
index 31ace2d..0000000
--- a/help/fr/reorder.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Réorganisation des pages</title>
-
-    <p>Pour déplacer une page, faites un clic droit dessus et sélectionnez <gui><em>Déplacer vers la gauche</em></gui> ou <gui><em>Déplacer vers la droite</em></gui>.</p> 
-    
-    <p>Alternativement, vous pouvez déplacer une page en la sélectionnant en premier, puis en choisissant <gui><em>Déplacer vers la gauche</em></gui> ou <gui><em>Déplacer vers la droite</em></gui> depuis le menu « Page ».</p> 
-
-</page>
diff --git a/help/fr/rotate.page b/help/fr/rotate.page
deleted file mode 100644
index b4c60a3..0000000
--- a/help/fr/rotate.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Faire pivoter une page</title>
-
-    <p>Dans <app>Simple Scan</app>, vous pouvez changer l'orientation d'une page avant ou après la numérisation. Actuellement, il y a quatre façons de faire pivoter une page :</p>
-    
-    <steps>
-      <title>Utiliser les boutons de la barre d'outils</title>
-      <item><p>Sélectionnez la page que vous souhaitez faire pivoter en cliquant dessus une fois.</p></item>
-      <item><p>Cliquez sur une des flèches de la barre d'outils pour faire pivoter la page dans la direction souhaitée.</p></item>
-    </steps>
-    <steps>
-      <title>Utiliser le clic droit</title>
-      <item><p>Faites un clic droit sur la page que vous souhaitez faire pivoter.</p></item>
-      <item><p>Depuis le menu contextuel, sélectionnez « Faire pivoter vers la gauche » ou « Faire pivoter vers la droite ».</p></item>
-    </steps>
-    
-    <steps>
-      <title>Utiliser un menu</title>
-      <item><p>Sélectionnez la page que vous souhaitez faire pivoter en cliquant dessus une fois.</p></item>
-      <item><p>Cliquez sur le menu « Page » et sélectionnez « Faire pivoter vers la gauche » ou « Faire pivoter vers la droite ».</p></item>
-    </steps>
-    
-    <steps>
-      <title>Utiliser les raccourcis</title>
-      <item><p>Sélectionnez la page que vous souhaitez faire pivoter en cliquant dessus une fois.</p></item>
-      <item><p>Appuyez sur une des touches de raccourci suivantes :</p>
-	<table frame="bottom left right" rules="rows cols" shade="rows">
-	<tr>
-		<td><p><em>Commande</em></p></td>
-		<td><p><em>Touches de raccourci</em></p></td>
-	</tr>
-	<tr>
-		<td><p>Faire pivoter vers la gauche</p></td>
-		<td><p><key>[</key> (crochet gauche)</p></td>
-	</tr>
-	<tr>
-		<td><p>Faire pivoter vers la droite</p></td>
-		<td><p><key>]</key> (crochet droit)</p></td>
-	</tr>
-	</table>
-      </item>
-    </steps>
-    
-    <note><p>Chaque nouvelle page numérisée utilisera la rotation précédente.</p></note>
-</page>
diff --git a/help/fr/save.page b/help/fr/save.page
deleted file mode 100644
index ca66518..0000000
--- a/help/fr/save.page
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Enregistrement vers un fichier</title>
-
-    <steps>
-      <item>
-	<p>Naviguez vers le menu <guiseq><gui>Document</gui><gui>Enregistrer sous</gui></guiseq> (ou appuyez sur <keyseq><key>Maj</key><key>Ctrl</key><key>S</key></keyseq>).</p>
-      </item>
-      <item>
-	<p>Depuis la boîte de dialogue « Enregistrer sous », sélectionnez un des types de fichier pris en charge ou changez simplement l'extension dans le champ « Nom ».</p>
-      </item>
-      <item>
-	<p>Cliquez sur le bouton « Enregistrer ».</p>
-      </item>
-    </steps>
-    
-    
-<table frame="bottom left right top" rules="rows cols" shade="rows">
-	<title>Types de fichiers pris en charge</title>
-	<tr>
-		<td><p><em>Type</em></p></td>
-		<td><p><em>Brève description</em></p></td>
-	</tr>
-	<tr>
-		<td><p>PDF</p></td>
-		<td><p>Un fichier PDF peut contenir plusieurs pages, comme un livre, et est facile à distribuer. Seul un petit nombre de programmes Linux peuvent modifier des documents PDF, ainsi ce format est principalement recommandé pour l'archivage. La taille du document PDF est affectée par la <link xref="quality">qualité de l'image</link>. Consultez la <link href="https://fr.wikipedia.org/wiki/Portable_Document_Format">page Wikipédia sur le format PDF</link> pour plus d'informations.</p></td>
-	</tr>
-	<tr>
-		<td><p>JPEG</p></td>
-		<td><p>JPEG est le format de fichier utilisé par les appareils photo numériques pour enregistrer des images. Un fichier JPEG est relativement léger, très facile à distribuer et adapté pour le téléchargement sur les sites de réseaux sociaux. La plupart des systèmes d'exploitation sont livrés avec un éditeur JPEG par défaut. Si vous avez numérisé plusieurs pages, un fichier JPEG sera créé pour chaque page. Utilisez ce type de fichier si vous souhaitez modifier ou télécharger les images numérisées. La taille du fichier JPEG est affectée par la <link xref="quality">qualité de l'image</link>. Consultez la <link href="https://fr.wikipedia.org/wiki/JPEG">page Wikipédia sur le format JPEG</link> pour plus d'informations.</p></td>
-	</tr>
-	<tr>
-		<td><p>PNG</p></td>
-		<td><p>Les fichiers PNG contiennent les données brutes du périphérique de numérisation. Cela les rend très volumineux et peu adaptés à la distribution. Si vous avez numérisé plusieurs pages, un fichier PNG sera créé pour chaque page. Consultez la <link href="https://fr.wikipedia.org/wiki/Portable_Network_Graphics">page Wikipédia sur le format PNG</link> pour plus d'informations.</p></td>
-	</tr>
-	<tr>
-		<td><p>TIFF</p></td>
-		<td><p>Les fichiers TIFF contiennent les données brutes du périphérique de numérisation. Cela les rend très volumineux et peu adaptés à la distribution. Si vous avez numérisé plusieurs pages, un fichier TIFF sera créé pour chaque page. Consultez la <link href="https://fr.wikipedia.org/wiki/Tagged_Image_File_Format">page Wikipédia sur le format TIFF</link> pour plus d'informations.</p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/fr/scanner.page b/help/fr/scanner.page
deleted file mode 100644
index 2c6e3a8..0000000
--- a/help/fr/scanner.page
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="fr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Sélection d'un périphérique de numérisation</title>
-
-    <p>Si vous avez plusieurs périphériques de numérisation, vous pouvez changer le périphérique sélectionné depuis le menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>.</p>
-    <media type="image" src="figures/preferences.png"/>
-    <p>Vos périphériques de numérisation locaux sont automatiquement détectés chaque fois que vous démarrez <app>Simple Scan</app> et à chaque fois que vous connectez un périphérique de numérisation USB. Si vous connectez un périphérique de numérisation en réseau lorsque <app>Simple Scan</app> fonctionne, vous devrez relancer <app>Simple Scan</app> pour que le périphérique soit détecté.</p>
-</page>
diff --git a/help/fr/scanning.page b/help/fr/scanning.page
deleted file mode 100644
index 39b7a3e..0000000
--- a/help/fr/scanning.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="fr">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Numérisation d'une page</title>
-
-    <p>Pour numériser un document avec votre périphérique de numérisation :</p>
-    <steps>
-      <item><p>Connectez le périphérique de numérisation à votre ordinateur et allumez-le.</p></item>
-      <item><p>Ouvrir l'application <app>Simple Scan</app>.</p></item>
-      <item><p>Cliquez sur la flèche à droite du bouton « Numériser »  et sélectionnez le type de document que vous voulez numériser : <em>Photo</em> ou <em>Texte</em>.</p>
-	     <media type="image" src="figures/scan_toolbar.png"/></item>
-      <item><p>Cliquez sur le bouton « Numériser » de la barre d'outils (ou appuyez sur <keyseq><key>Ctrl</key><key>1</key></keyseq>).</p></item>
-    </steps>
-
-    <note><p>La page sera affichée telle qu'elle a été numérisée. Pour arrêter la numérisation à n'importe quel moment, appuyez sur la touche <key>Échap</key> du clavier. Chaque page numérisée est placée à la fin du document.</p></note>
-
-    <p>Le type de document peut aussi être modifié depuis le menu <guiseq><gui>Document</gui> <gui>Numériser</gui></guiseq>. Sélectionnez <gui><em>Texte</em></gui> si vous souhaitez que le document soit numérisé rapidement en noir et blanc ; sélectionnez <gui><em>Photo</em></gui> pour un document de résolution élevée en couleur. Consultez <link xref="dpi"/> pour plus de détails et plus d'options.</p>
-</page>
diff --git a/help/hr/adf.page b/help/hr/adf.page
deleted file mode 100644
index 4129f76..0000000
--- a/help/hr/adf.page
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Upotreba automatskog uvlakača dokumenta</title>
-
-    <p>Ako vaš pisač sadrži značajku automatskog uvlakača dokumenata (ADF) možete skenirati sve stranice iz uvlakača pomoću jednog od sljedećih načina:</p>
-      <steps>
-	<title/>
-	<title>Upotrebom prečaca tipkovnice</title>
-	<item>
-	  <p>Pritisnite <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
-	</item>      
-      </steps>
-      
-      <steps>
-	<title>Upotrebom izbornika</title>
-	<item>
-	  <p>Idite u <guiseq><gui>Dokument</gui> <gui>Skeniraj</gui><gui>Sve stranice iz uvlakača</gui></guiseq>.</p>
-	</item>
-      </steps>
-      
-      <steps>
-	<title>Upotrebom tipka alatne trake</title>
-	<item>
-	  <p>Kliknite strelicu na "Skeniraj" tipki.</p>
-	</item>
-	<item>
-	  <p>Odaberite "Sve stranice iz uvlakača".</p>
-	  <media type="image" src="figures/scan_toolbar.png"/>
-	</item>
-      </steps>
-    
-    
-    <note style="tip">
-    <p>Prema zadanome, obje stranice lista će se skenirati ako vaš skener podržava ovu značajku. Možete odabrati jednostrano skeniranje iz izbornika<guiseq><gui>Dokument</gui><gui>Osobitosti</gui></guiseq>.</p>
-    <media type="image" src="figures/preferences.png"/>
-    </note>
-    
-</page>
diff --git a/help/hr/brightness-contrast.page b/help/hr/brightness-contrast.page
deleted file mode 100644
index 07148da..0000000
--- a/help/hr/brightness-contrast.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Postavljanje svjetline i kontrasta</title>
-
-    <p>Neki pisači dopuštaju korisniku prilagodbu svjetline i kontrasta tijekom skeniranja. Ako su vaši skenirani dokumenti ili fotografije pretamne ili presvijetle možete prilagoditi te postavke iz izbornika <guiseq><gui>Dokument</gui><gui>Osobitosti</gui></guiseq>.</p>
-</page>
diff --git a/help/hr/crop.page b/help/hr/crop.page
deleted file mode 100644
index e7bc434..0000000
--- a/help/hr/crop.page
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Izrezivanje</title>
-
-    <p>Značajka izrezivanja <app>Skeniranja dokumenta</app> omogućuje vam samo korištenje određenog dijela skenirane slike. Možete omogućiti izrezivanje prije i nakon skeniranja stranice, i uvijek možete promijeniti dimenzije izrezanog dijela slike. Kada je izrezivanje omogućeno, pojavit će se siva maska preko područja koja se ne koriste. Možete omogućiti izrezivanje i odabrati željene dimenzije pomoću jednog od sljedećih načina:</p>
-    
-    <steps>
-      <title>Upotrebom desnog klika</title>
-      <item><p>Desno kliknite bilo gdje na sliku i odaberite "Izreži".</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>Upotrebom izbornika</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/hr/dpi.page b/help/hr/dpi.page
deleted file mode 100644
index c20d88b..0000000
--- a/help/hr/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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/hr/email.page b/help/hr/email.page
deleted file mode 100644
index 7fb6f2d..0000000
--- a/help/hr/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Sending via Email</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/hr/hr.po b/help/hr/hr.po
index db0613e..cbb91f3 100644
--- a/help/hr/hr.po
+++ b/help/hr/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-11-25 21:46+0000\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\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: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,55 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  gogo https://launchpad.net/~trebelnik-stefina"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr "Ali Shtarbanov"
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-"vanjsko ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-"<media type=\"image\" src=\"figures/icon.png\"/> Skeniranje dokumenata "
-"Priručnik"
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Skeniranje stranica"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Promjena dokumenta"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Upotreba dokumenta"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr "Prečaci Skeniranja dokumenata"
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -381,6 +332,55 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+"vanjsko ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Skeniranje dokumenata "
+"Priručnik"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Skeniranje stranica"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Promjena dokumenta"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Upotreba dokumenta"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr "Prečaci Skeniranja dokumenata"
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/hr/hr.stamp b/help/hr/hr.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/hr/hr.stamp
+++ /dev/null
diff --git a/help/hr/index.page b/help/hr/index.page
deleted file mode 100644
index f22d349..0000000
--- a/help/hr/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="hr">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Skeniranje dokumenata Priručnik</title>
-    
-    <section id="acquire" style="2column">
-        <title>Skeniranje stranica</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Promjena dokumenta</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Upotreba dokumenta</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Prečaci Skeniranja dokumenata</title>
-    </section>
-</page>
diff --git a/help/hr/legal.xml b/help/hr/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/hr/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/hr/print.page b/help/hr/print.page
deleted file mode 100644
index c85ad2e..0000000
--- a/help/hr/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Printing</title>
-
-    <p>
-    <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/hr/quality.page b/help/hr/quality.page
deleted file mode 100644
index 9e8305c..0000000
--- a/help/hr/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/hr/reorder.page b/help/hr/reorder.page
deleted file mode 100644
index 6664996..0000000
--- a/help/hr/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordering Pages</title>
-
-    <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>
-    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/hr/rotate.page b/help/hr/rotate.page
deleted file mode 100644
index f372c24..0000000
--- a/help/hr/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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>Upotrebom izbornika</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/hr/save.page b/help/hr/save.page
deleted file mode 100644
index 479b6eb..0000000
--- a/help/hr/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Saving to a File</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/hr/scanner.page b/help/hr/scanner.page
deleted file mode 100644
index d49fb9d..0000000
--- a/help/hr/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="hr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecting a Scanner</title>
-
-    <p>
-    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 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/hr/scanning.page b/help/hr/scanning.page
deleted file mode 100644
index 9e3ba51..0000000
--- a/help/hr/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="hr">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer 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>
-
-    <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>
-      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/hu/adf.page b/help/hu/adf.page
deleted file mode 100644
index d7adae6..0000000
--- a/help/hu/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Automatikus dokumentumadagoló használata</title>
-
-    <p>
-    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 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/hu/brightness-contrast.page b/help/hu/brightness-contrast.page
deleted file mode 100644
index 4e6f044..0000000
--- a/help/hu/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/hu/crop.page b/help/hu/crop.page
deleted file mode 100644
index d76b6e0..0000000
--- a/help/hu/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Vágás</title>
-
-    <p>
-    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/hu/dpi.page b/help/hu/dpi.page
deleted file mode 100644
index 6829865..0000000
--- a/help/hu/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>A beolvasás felbontásának beállítása</title>
-
-    <p>
-    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/hu/email.page b/help/hu/email.page
deleted file mode 100644
index 9d6ab89..0000000
--- a/help/hu/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Küldés e-mailben</title>
-
-    <p>Az aktuális dokumentum e-mailben történő elküldéséhez használja a <guiseq><gui>Dokumentum</gui><gui>E-mail</gui></guiseq> menüpontot vagy a <keyseq><key>Ctrl</key><key>E</key></keyseq> billentyűkombinációt. Az e-mail programja megnyílik egy új üzenettel, amelyhez csatolva lesz a beolvasott dokumentum.</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>A fájlformátumokkal kapcsolatban további információkért lásd a <link xref="save"/> oldalt.</p>
-</page>
diff --git a/help/hu/hu.po b/help/hu/hu.po
index df756ef..651a299 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -3,74 +3,27 @@
 # This file is distributed under the same license as the simple-scan package.
 #
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2014.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2014, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2014-02-21 16:01+0000\n"
-"Last-Translator: Gabor Kelemen <kelemeng@openscope.org>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
+"POT-Creation-Date: 2017-07-02 21:08+0000\n"
+"PO-Revision-Date: 2017-07-31 23:50+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
+"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
-"Language: hu\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Gabor Kelemen https://launchpad.net/~kelemeng"
-
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Oldalak szkennelése"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "A dokumentum módosítása"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "A dokumentum használata"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
+msgstr "Kelemen Gábor <kelemeng at ubuntu dot com>"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -83,23 +36,23 @@ msgid ""
 "If your scanner features an Automatic Document Feeder (ADF) you can scan all "
 "the pages from the feeder via one of following methods:"
 msgstr ""
+"Ha szkennere rendelkezik automatikus dokumentumadagolóval, akkor az összes "
+"oldalt beolvastathatja a következő módszerek használatával:"
 
 #. (itstool) path: steps/title
 #: C/adf.page:17
 msgid "Use a Keyboard Shortcut"
-msgstr ""
+msgstr "Gyorsbillentyűk"
 
 #. (itstool) path: item/p
 #: C/adf.page:19
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr ""
+msgstr "Nyomja meg a <keyseq><key>Ctrl</key><key>F</key></keyseq> kombinációt"
 
 #. (itstool) path: steps/title
-#: C/adf.page:24
-#: C/crop.page:27
-#: C/rotate.page:28
+#: C/adf.page:24 C/crop.page:27 C/rotate.page:28
 msgid "Use a Menu"
-msgstr ""
+msgstr "Menüpontok"
 
 #. (itstool) path: item/p
 #: C/adf.page:26
@@ -107,34 +60,37 @@ msgid ""
 "Navigate to <guiseq><gui>Document</gui> <gui>Scan</gui><gui>All Pages From "
 "Feeder</gui></guiseq>."
 msgstr ""
+"Válassza a <guiseq><gui>Dokumentum</gui><gui>Szkennelés</gui><gui>Minden "
+"oldal az adagolóból</gui></guiseq> menüpontot."
 
 #. (itstool) path: steps/title
 #: C/adf.page:33
 msgid "Use the Toolbar Buttons"
-msgstr ""
+msgstr "Eszköztárgombok"
 
 #. (itstool) path: item/p
 #: C/adf.page:35
 msgid "Click on the arrow to the right of the \"Scan\" button."
-msgstr ""
+msgstr "Kattintson a nyílra a „Szkennelés” gomb jobb oldalán."
 
 #. (itstool) path: item/p
 #: C/adf.page:38
 msgid "Choose \"All Pages From Feeder\"."
-msgstr ""
+msgstr "Válassza a „Minden oldal az adagolóból” almenüt."
 
 #. (itstool) path: item/media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:39
-#: C/scanning.page:20
+#: C/adf.page:39 C/scanning.page:20
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
 "md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 msgstr ""
+"external ref='figures/scan_toolbar.png' "
+"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 
 #. (itstool) path: note/p
 #: C/adf.page:45
@@ -143,6 +99,9 @@ msgid ""
 "capability. You can choose single side scanning from the "
 "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Alapesetben a lap mindkét oldala beolvasásra kerül, ha a szkenner képes erre. "
+"Egy oldal beolvasása a <guiseq><gui>Dokumentum</gui><gui>"
+"Beállítások</gui></guiseq> menüpont alatt állítható be."
 
 #. (itstool) path: note/media
 #. (itstool) path: page/media
@@ -150,18 +109,17 @@ msgstr ""
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:49
-#: C/dpi.page:16
-#: C/scanner.page:14
+#: C/adf.page:49 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
 msgid ""
 "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
 msgstr ""
+"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
 msgid "Setting brightness and Contrast"
-msgstr ""
+msgstr "Fényerő és kontraszt beállítása"
 
 #. (itstool) path: page/p
 #: C/brightness-contrast.page:11
@@ -171,6 +129,10 @@ msgid ""
 "settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> "
 "menu."
 msgstr ""
+"Egyes szkennerek lehetővé teszik a fényerő és kontraszt állítását "
+"szkenneléskor. Ha a beolvasott képek túl sötétek vagy világosak, akkor "
+"megpróbálhatja módosítani ezeket a beállításokat a <guiseq><gui>Dokumentum<"
+"/gui><gui>Tulajdonságok</gui></guiseq> menüből."
 
 #. (itstool) path: page/title
 #: C/crop.page:9
@@ -187,16 +149,24 @@ msgid ""
 "used shown in gray. You can enable crop and choose the desired dimensions "
 "via one of the following methods:"
 msgstr ""
+"A <app>Szkenner</app> vágás funkciója lehetővé teszi a beolvasott kép csak "
+"egy részének használatát. A vágást bekapcsolhatja a beolvasás előtt vagy után "
+"is, és bármikor megváltoztathatja a vágási keret méretét. Ha a vágás "
+"engedélyezett, akkor egy maszk jelenik meg az aktuális oldal fölött, a "
+"használaton kívüli területet szürkén jelenítve meg. A következő módokon "
+"engedélyezheti a vágást és választhatja ki a kívánt méretet:"
 
 #. (itstool) path: steps/title
 #: C/crop.page:19
 msgid "Use a Right Click"
-msgstr ""
+msgstr "Helyi menü"
 
 #. (itstool) path: item/p
 #: C/crop.page:20
 msgid "Right click anywhere on the image area and select \"Crop\"."
 msgstr ""
+"Kattintson a jobb egérgombbal bárhová a kép területen, és válassza a Vágás "
+"menüpontot."
 
 #. (itstool) path: item/p
 #: C/crop.page:21
@@ -204,17 +174,21 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually set "
 "the crop frame's dimensions by dragging its borders."
 msgstr ""
+"Válassza a rögzített vágási keretek egyikét, vagy az Egyéni lehetőséget a "
+"vágási keret méretének megadásához a szegélyei húzásával."
 
 #. (itstool) path: item/p
-#: C/crop.page:23
-#: C/crop.page:30
+#: C/crop.page:23 C/crop.page:30
 msgid "Click and hold the frame, then move it to the desired position."
 msgstr ""
+"Kattintson és tartsa lenyomva az egérgombot, majd húzza a keretet a kívánt "
+"pozícióba."
 
 #. (itstool) path: item/p
 #: C/crop.page:28
 msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
 msgstr ""
+"Válassza az <guiseq><gui>Oldal</gui><gui>Vágás</gui></guiseq> menüpontot."
 
 #. (itstool) path: item/p
 #: C/crop.page:29
@@ -222,16 +196,18 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually adjust "
 "the frame's dimensions by dragging its borders."
 msgstr ""
+"Válassza a rögzített vágási keretek egyikét, vagy az Egyéni lehetőséget a "
+"keret méretének megadásához a szegélyei húzásával."
 
 #. (itstool) path: steps/title
 #: C/crop.page:34
 msgid "Use the Toolbar"
-msgstr ""
+msgstr "Eszköztár"
 
 #. (itstool) path: item/p
 #: C/crop.page:35
 msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
-msgstr ""
+msgstr "Kattintson a <gui>Vágás</gui> gombra az eszköztáron."
 
 #. (itstool) path: note/p
 #: C/crop.page:36
@@ -239,17 +215,21 @@ msgid ""
 "This is the same as choosing \"Custom\" in step 2 of the aforementioned "
 "methods."
 msgstr ""
+"Ez megegyezik a korábbi módszerek 2. lépésében az Egyéni lehetőség "
+"választásával."
 
 #. (itstool) path: item/p
 #: C/crop.page:38
 msgid ""
 "Drag the borders of the frame to set the desired dimensions and position."
 msgstr ""
+"Húzza a keret szegélyeit a kívánt méret és elhelyezkedés beállításához."
 
 #. (itstool) path: note/p
 #: C/crop.page:42
 msgid "Each new scanned page will use the previous crop."
 msgstr ""
+"Minden újonnan beolvasott oldal az előző vágási beállításokat fogja használni."
 
 #. (itstool) path: page/title
 #: C/dpi.page:9
@@ -261,9 +241,13 @@ msgstr "A beolvasás felbontásának beállítása"
 msgid ""
 "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."
+"You can change these settings from the <guiseq><gui>Document</"
+"gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"A <gui><em>Szöveg</em></gui> dokumentumtípus alapértelmezett felbontása 150 "
+"dpi (képpont hüvelykenként), a <gui><em>Fénykép</em></gui> dokumentumtípusé "
+"pedig 300 dpi. Ezek a beállítások a <guiseq><gui>Dokumentum</gui><gui>"
+"Beállítások</gui></guiseq> menüpontban módosíthatók."
 
 #. (itstool) path: page/p
 #: C/dpi.page:18
@@ -271,60 +255,58 @@ msgid ""
 "The available scanning resolutions for both document types (Text and Photo) "
 "are the same and are listed in the following table:"
 msgstr ""
+"Az elérhető szkennelési felbontások mindkét dokumentumtípus esetén azonosak, "
+"ezeket a következő táblázat tartalmazza:"
 
 #. (itstool) path: td/p
 #: C/dpi.page:23
 msgid "<em>Text Resolution</em>"
-msgstr ""
+msgstr "<em>Szöveg felbontása</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:24
 msgid "<em>Photo Resolution</em>"
-msgstr ""
+msgstr "<em>Fénykép felbontása</em>"
 
 #. (itstool) path: td/p
-#: C/dpi.page:27
-#: C/dpi.page:28
+#: C/dpi.page:27 C/dpi.page:28
 msgid "75 dpi (draft)"
-msgstr ""
+msgstr "75 DPI (piszkozat)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:31
 msgid "150 dpi (default)"
-msgstr ""
+msgstr "150 DPI (alapértelmezett)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:32
 msgid "150 dpi"
-msgstr ""
+msgstr "150 DPI"
 
 #. (itstool) path: td/p
 #: C/dpi.page:35
 msgid "300 dpi"
-msgstr ""
+msgstr "300 DPI"
 
 #. (itstool) path: td/p
 #: C/dpi.page:36
 msgid "300 dpi (default)"
-msgstr ""
+msgstr "300 DPI (alapértelmezett)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:39
-#: C/dpi.page:40
+#: C/dpi.page:39 C/dpi.page:40
 msgid "600 dpi"
-msgstr ""
+msgstr "600 DPI"
 
 #. (itstool) path: td/p
-#: C/dpi.page:43
-#: C/dpi.page:44
+#: C/dpi.page:43 C/dpi.page:44
 msgid "1200 dpi (high resolution)"
-msgstr ""
+msgstr "1200 DPI (nagy felbontás)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:47
-#: C/dpi.page:48
+#: C/dpi.page:47 C/dpi.page:48
 msgid "2400 dpi"
-msgstr ""
+msgstr "2400 DPI"
 
 #. (itstool) path: note/p
 #: C/dpi.page:52
@@ -333,6 +315,9 @@ msgid ""
 "while <gui><em>Photo</em></gui> documents are always scanned in color, at "
 "any resolution!"
 msgstr ""
+"A <gui><em>szöveges</em></gui> dokumentumok mindig fekete-fehérben kerülnek "
+"beolvasásra, míg a <gui><em>fényképek</em></gui> mindig színesben bármely felbontás "
+"esetén."
 
 #. (itstool) path: page/title
 #: C/email.page:9
@@ -342,10 +327,10 @@ msgstr "Küldés e-mailben"
 #. (itstool) path: page/p
 #: C/email.page:11
 msgid ""
-"To email the current document use the "
-"<guiseq><gui>Document</gui><gui>Email</gui></guiseq> menu "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be "
-"opened with a new message containing the scanned document as an attachment."
+"To email the current document use the <guiseq><gui>Document</gui><gui>Email</"
+"gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your "
+"email program will be opened with a new message containing the scanned "
+"document as an attachment."
 msgstr ""
 "Az aktuális dokumentum e-mailben történő elküldéséhez használja a "
 "<guiseq><gui>Dokumentum</gui><gui>E-mail</gui></guiseq> menüpontot vagy a "
@@ -357,16 +342,60 @@ msgstr ""
 #: C/email.page:16
 msgid ""
 "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."
+"attachment for each page. Conversely, if the document type was set to \"Photo"
+"\", the email will have a JPEG attachment for each page."
 msgstr ""
+"Ha a dokumentum típusa szövegre van állítva, akkor az e-mailhez egy PDF "
+"melléklet lesz csatolva. "
+"Ha a dokumentum fénykép típusú, akkor minden oldal egy-egy JPEG mellékletként "
+"lesz az e-mailhez csatolva."
 
 #. (itstool) path: page/p
 #: C/email.page:21
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
-"A fájlformátumokkal kapcsolatban további információkért lásd a <link "
-"xref=\"save\"/> oldalt."
+"A fájlformátumokkal kapcsolatban további információkért lásd a <link xref="
+"\"save\"/> oldalt."
+
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr "<media type=\"image\" src=\"figures/icon.png\"/> Szkenner kézikönyve"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Oldalak szkennelése"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "A dokumentum módosítása"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "A dokumentum használata"
 
 #. (itstool) path: p/link
 #: C/legal.xml:4
@@ -402,11 +431,15 @@ msgid ""
 "<app>Simple Scan</app> a very convenient tool for making copies of documents "
 "or photos."
 msgstr ""
+"A <app>Szkenner</app> lehetővé teszi a beolvasott dokumentum kinyomtatását "
+"közvetlenül a felületéről, a dokumentum mentése nélkül. Ez a funkció "
+"kényelmes eszközzé teszi a <app>Szkennert</app> dokumentumok vagy fényképek "
+"másolására."
 
 #. (itstool) path: steps/title
 #: C/print.page:17
 msgid "To Print a Document"
-msgstr ""
+msgstr "Dokumentum nyomtatása"
 
 #. (itstool) path: item/p
 #: C/print.page:19
@@ -415,6 +448,9 @@ msgid ""
 "the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>. This "
 "will open the \"Print\" dialog box."
 msgstr ""
+"Válassza a <guiseq><gui>Dokumentum</gui><gui>Nyomtatás</gui></guiseq> "
+"menüpontot, vagy nyomja meg a <keyseq><key>Ctrl</key><key>P</key></keyseq> "
+"kombinációt. Megnyílik a Nyomtatás ablak."
 
 #. (itstool) path: item/p
 #: C/print.page:25
@@ -422,24 +458,32 @@ msgid ""
 "From the \"Print\" dialog box choose your desired printing settings and/or "
 "Print Preview the document, then press the \"Print\" button."
 msgstr ""
+"A Nyomtatás ablakban válassza ki a kívánt nyomtatási beállításokat, ha "
+"szeretné, akkor nézze meg az előnézetet, majd nyomja meg a Nyomtatás gombot."
 
 #. (itstool) path: page/title
 #: C/quality.page:9
 msgid "Setting the Image Quality"
-msgstr ""
+msgstr "A képminőség beállítása"
 
 #. (itstool) path: page/p
 #: C/quality.page:11
 msgid ""
 "You can adjust the image quality that is used when the scan is converted to "
-"a file by changing this setting in the "
-"<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu. Using a low "
-"quality will result in a small file size but may show some blurring or "
-"blockiness in the image. A high quality will keep all the scanned "
-"information but require a larger file size. See the <link "
-"href=\"https://en.wikipedia.org/wiki/Lossy_compression\">Lossy compression "
-"Wikipedia page</link> for more information."
-msgstr ""
+"a file by changing this setting in the save dialog. Using a low quality will "
+"result in a small file size but may show some blurring or blockiness in the "
+"image. A high quality will keep all the scanned information but require a "
+"larger file size. See the <link href=\"https://en.wikipedia.org/wiki/"
+"Lossy_compression\">Lossy compression Wikipedia page</link> for more "
+"information."
+msgstr ""
+"A mentési ablakban ezzel a beállítással módosíthatja a beolvasott kép fájlba "
+"mentésekor használandó képminőséget. Alacsonyabb minőség kisebb fájlméretet "
+"eredményez, de elmosódottságot vagy kockásodást okozhat a képen. A jobb "
+"minőség minden beolvasott információt megőriz, de nagyobb fájlméretet "
+"igényel. További információkért nézze meg a <link "
+"href=\"https://hu.wikipedia.org/wiki/Vesztes%C3%A9ges_t%C3%B6m%C3%B6r%C3%ADt%"
+"C3%A9s\">Veszteséges tömörítés Wikipédia-oldalát</link>."
 
 #. (itstool) path: page/title
 #: C/reorder.page:9
@@ -452,6 +496,9 @@ msgid ""
 "To move a page, right click on it and choose <gui><em>Move Left</em></gui> "
 "or <gui><em>Move Right</em></gui>."
 msgstr ""
+"Egy oldal áthelyezéséhez kattintson rá a jobb egérgombbal, és válassza a <gui>"
+"<em>Mozgatás balra</em></gui> vagy <gui><em>Mozgatás jobbra</em></gui> "
+"menüpontot."
 
 #. (itstool) path: page/p
 #: C/reorder.page:16
@@ -460,11 +507,14 @@ msgid ""
 "<gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "
 "\"Page\" menu."
 msgstr ""
+"Ennek alternatívájaként ki is jelölheti az oldalt, majd az Oldal menü <gui><"
+"em>Mozgatás balra</em></gui> vagy <gui><em>Mozgatás jobbra</em></gui> "
+"pontjának kiválasztásával áthelyezheti azt."
 
 #. (itstool) path: page/title
 #: C/rotate.page:9
 msgid "Rotating a Page"
-msgstr ""
+msgstr "Oldal forgatása"
 
 #. (itstool) path: page/p
 #: C/rotate.page:11
@@ -473,18 +523,18 @@ msgid ""
 "before or after scanning the page. Currently, there are four ways to rotate "
 "a page:"
 msgstr ""
+"A <app>Szkennerben</app> az oldal forgatását a szkennelés előtt vagy után is "
+"módosíthatja. Jelenleg négyféleképpen forgathat el egy oldalt:"
 
 #. (itstool) path: steps/title
 #: C/rotate.page:17
 msgid "Use Toolbar Buttons"
-msgstr ""
+msgstr "Eszköztárgombokkal"
 
 #. (itstool) path: item/p
-#: C/rotate.page:18
-#: C/rotate.page:29
-#: C/rotate.page:35
+#: C/rotate.page:18 C/rotate.page:29 C/rotate.page:35
 msgid "Select the page you want to rotate by clicking on it once."
-msgstr ""
+msgstr "Válassza ki a forgatni kívánt oldalt egy kattintással."
 
 #. (itstool) path: item/p
 #: C/rotate.page:19
@@ -492,72 +542,76 @@ msgid ""
 "Press one of the arrows on the toolbar to rotate the page in the desired "
 "direction."
 msgstr ""
+"Nyomja meg az eszköztár nyilainak egyikét az oldal kívánt irányba "
+"forgatásához."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:22
 msgid "Use Right Click"
-msgstr ""
+msgstr "Helyi menü használatával"
 
 #. (itstool) path: item/p
 #: C/rotate.page:23
 msgid "Right click on the page you want to rotate."
-msgstr ""
+msgstr "Kattintson a jobb egérgombbal a forgatni kívánt oldalra."
 
 #. (itstool) path: item/p
 #: C/rotate.page:24
 msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
 msgstr ""
+"A helyi menüből válassza a Forgatás balra vagy a Forgatás jobbra menüpontot."
 
 #. (itstool) path: item/p
 #: C/rotate.page:30
-msgid ""
-"Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
+msgid "Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
 msgstr ""
+"Kattintson az Oldal menüre, és válassza a Forgatás balra vagy a Forgatás "
+"jobbra menüpontot."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:34
 msgid "Use Shortcuts"
-msgstr ""
+msgstr "Gyorsbillentyűkkel"
 
 #. (itstool) path: item/p
 #: C/rotate.page:36
 msgid "Press one of the following shortcut keys:"
-msgstr ""
+msgstr "Nyomja meg a következő gyorsbillentyűk egyikét:"
 
 #. (itstool) path: td/p
 #: C/rotate.page:39
 msgid "<em>Command</em>"
-msgstr ""
+msgstr "<em>Parancs</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:40
 msgid "<em>Shortcut Key</em>"
-msgstr ""
+msgstr "<em>Gyorsbillentyű</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:43
 msgid "Rotate Left"
-msgstr ""
+msgstr "Forgatás balra"
 
 #. (itstool) path: td/p
 #: C/rotate.page:44
 msgid "<key>[</key> (left bracket)"
-msgstr ""
+msgstr "<key>[</key> (nyitó szögletes zárójel)"
 
 #. (itstool) path: td/p
 #: C/rotate.page:47
 msgid "Rotate Right"
-msgstr ""
+msgstr "Forgatás jobbra"
 
 #. (itstool) path: td/p
 #: C/rotate.page:48
 msgid "<key>]</key> (right bracket)"
-msgstr ""
+msgstr "<key>]</key> (záró szögletes zárójel)"
 
 #. (itstool) path: note/p
 #: C/rotate.page:54
 msgid "Each new scanned page will use the previous rotation."
-msgstr ""
+msgstr "Minden újonnan beolvasott oldal a korábbi forgatást használja."
 
 #. (itstool) path: page/title
 #: C/save.page:9
@@ -570,6 +624,9 @@ msgid ""
 "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>)."
 msgstr ""
+"Válassza a <guiseq><gui>Dokumentum</gui><gui>Mentés másként</gui></guiseq> "
+"menüpontot vagy nyomja meg a <keyseq><key>Ctrl</key><key>Shift</key><key>S<"
+"/key></keyseq> kombinációt."
 
 #. (itstool) path: item/p
 #: C/save.page:18
@@ -577,31 +634,33 @@ msgid ""
 "From the \"Save As\" dialog box, choose one of the supported file types, or "
 "simply change the extension in the \"Name\" field."
 msgstr ""
+"A Mentés másként ablakban válassza az egyik támogatott fájltípust, vagy "
+"egyszerűen csak írja be a kiterjesztést a Név mezőbe."
 
 #. (itstool) path: item/p
 #: C/save.page:23
 msgid "Press the \"Save\" button."
-msgstr ""
+msgstr "Nyomja meg a Mentés gombot."
 
 #. (itstool) path: table/title
 #: C/save.page:29
 msgid "Supported File Types"
-msgstr ""
+msgstr "A támogatott fájltípusok"
 
 #. (itstool) path: td/p
 #: C/save.page:31
 msgid "<em>Type</em>"
-msgstr ""
+msgstr "<em>Típus</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:32
 msgid "<em>Brief Description</em>"
-msgstr ""
+msgstr "<em>Rövid leírás</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:35
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #. (itstool) path: td/p
 #: C/save.page:36
@@ -613,6 +672,12 @@ msgid ""
 "<link href=\"http://en.wikipedia.org/wiki/pdf\">PDF Wikipedia page</link> "
 "for more information."
 msgstr ""
+"Egy PDF a könyvekhez hasonlóan több oldalt is tartalmazhat, és egyszerűen "
+"terjeszthető. Csak kevés linuxos program képes a PDF dokumentumok "
+"módosítására, így ez a formátum elsődlegesen archiválásra javasolt. A PDF "
+"dokumentum méretét a <link xref=\"quality\">képminőség</link> befolyásolja. "
+"További információkért lásd a <link href=\"https://hu.wikipedia.org/wiki/Porta"
+"ble_Document_Format\">PDF Wikipédia oldalát</link>."
 
 #. (itstool) path: td/p
 #: C/save.page:43
@@ -627,11 +692,19 @@ msgid ""
 "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. The size of the JPEG file is affected by the <link "
-"xref=\"quality\">image quality</link>. See the <link "
-"href=\"http://en.wikipedia.org/wiki/jpeg\">JPEG Wikipedia page</link> for "
-"more information."
-msgstr ""
+"the scanned images. The size of the JPEG file is affected by the <link xref="
+"\"quality\">image quality</link>. See the <link href=\"http://en.wikipedia."
+"org/wiki/jpeg\">JPEG Wikipedia page</link> for more information."
+msgstr ""
+"A JPEG fájlformátumot a digitális fényképezőgépek használják képek mentésére. "
+"A JPEG fájlok viszonylag kicsik, egyszerűen terjeszthetők és alkalmasak a "
+"közösségi média oldalakra feltöltésre. A legtöbb operációs rendszer "
+"alapesetben tartalmaz JPEG szerkesztőt. Ha több oldalt is beolvasott, akkor "
+"minden egyes oldalhoz létrejön egy JPEG fájl. Ezt a fájltípust akkor "
+"használja, ha szeretné módosítani vagy feltölteni a beolvasott képeket. A "
+"JPEG fájlok méretét a <link xref=\"quality\">képminőség</link> befolyásolja. "
+"További információkért lásd a <link href=\"https://hu.wikipedia.org/wiki/JPEG"
+"\">JPEG Wikipédia oldalát</link>."
 
 #. (itstool) path: td/p
 #: C/save.page:53
@@ -643,25 +716,35 @@ msgstr "PNG"
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Portable_Network_Graphics\">PNG Wikipedia page</link> for more "
+"information."
 msgstr ""
+"A PNG fájlok a nyers adatokat tartalmazzák a szkennerből. Ez nagyon naggyá "
+"teszi azokat, így nem megfelelők terjesztésre. Ha több oldalt olvasott be, "
+"akkor minden oldalhoz egy külön PNG fájl készül. További információkért lásd "
+"a <link href=\"https://hu.wikipedia.org/wiki/PNG\">PNG Wikipédia oldalát<"
+"/link>."
 
 #. (itstool) path: td/p
 #: C/save.page:61
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #. (itstool) path: td/p
 #: C/save.page:62
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Tagged_Image_File_Format\">TIFF Wikipedia page</link> for more "
+"information."
 msgstr ""
+"A TIFF fájlok a nyers adatokat tartalmazzák a szkennerből. Ez nagyon naggyá "
+"teszi azokat, így nem megfelelők terjesztésre. Ha több oldalt olvasott be, "
+"akkor minden oldalhoz egy külön TIFF fájl készül. További információkért lásd "
+"a <link href=\"https://hu.wikipedia.org/wiki/Tagged_Image_File_Format\">TIFF "
+"Wikipédia oldalát</link>."
 
 #. (itstool) path: page/title
 #: C/scanner.page:9
@@ -674,6 +757,8 @@ msgid ""
 "If you have multiple scanning devices you can change the selected device "
 "from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Ha több szkennere van, akkor a <guiseq><gui>Dokumentum</gui><gui>Beállítások<"
+"/gui></guiseq> menüpont segítségével kiválaszthatja az éppen használandót."
 
 #. (itstool) path: page/p
 #: C/scanner.page:15
@@ -683,6 +768,10 @@ msgid ""
 "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."
 msgstr ""
+"A helyi szkennerek automatikusan felismerésre kerülnek a <app>Szkenner</app> "
+"elindításakor, és egy USB szkenner csatlakoztatásakor. Ha hálózati "
+"szkennerhez csatlakozik és a <app>Szkenner</app> már fut, akkor a "
+"felismeréséhez újra kell indítani a <app>Szkennert</app>."
 
 #. (itstool) path: info/title
 #: C/scanning.page:6
@@ -703,12 +792,12 @@ msgstr "Egy dokumentum beolvasásához a szkennerről:"
 #. (itstool) path: item/p
 #: C/scanning.page:16
 msgid "Connect the scanner to your computer and power it on."
-msgstr ""
+msgstr "Csatlakoztassa a szkennert a számítógéphez, és kapcsolja be."
 
 #. (itstool) path: item/p
 #: C/scanning.page:17
 msgid "Open <app>Simple Scan</app>."
-msgstr "Nyissa meg a <app>Simple Scant</app>."
+msgstr "Nyissa meg a <app>Szkennert</app>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:18
@@ -716,13 +805,17 @@ msgid ""
 "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>."
 msgstr ""
+"Kattintson a nyílra a „Szkennelés” gomb jobb oldalán, és válassza ki a "
+"beolvasni kívánt dokumentum típusát: <em>Fénykép</em> vagy <em>Szöveg</em>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:21
 msgid ""
-"Click the \"Scan\" button on the toolbar (or press "
-"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
+"Click the \"Scan\" button on the toolbar (or press <keyseq><key>Ctrl</"
+"key><key>1</key></keyseq>)."
 msgstr ""
+"Nyomja meg az eszköztár „Szkennelés” gombját, vagy a <keyseq><key>Ctrl</key><"
+"key>1</key></keyseq> billentyűkombinációt."
 
 #. (itstool) path: note/p
 #: C/scanning.page:24
@@ -731,13 +824,23 @@ msgid ""
 "the <key>Esc</key> key on the keyboard. Each page you scan is placed at the "
 "end of the document."
 msgstr ""
+"Az oldal a szkennelés közben megjelenik. A szkennelés megállításához bármikor "
+"megnyomhatja az <key>Esc</key> billentyűt. Minden beolvasott oldal a "
+"dokumentum végére kerül."
 
 #. (itstool) path: page/p
 #: C/scanning.page:29
 msgid ""
-"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."
+"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."
 msgstr ""
+"A dokumentum típusa a <guiseq><gui>Dokumentum</gui><gui>Szkennelés</gui><"
+"/guiseq> menüpont alatt módosítható. Válassza a <gui><em>Szöveg</em></gui> "
+"lehetőséget a dokumentum gyors, fekete-fehér beolvasásához, vagy a <gui><em>"
+"Fénykép</em></gui> lehetőséget a nagy felbontású, színes beolvasáshoz. "
+"További részletekért és beállításokért lásd <link xref=\"dpi\"/> oldalt."
+
+
diff --git a/help/hu/hu.stamp b/help/hu/hu.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/hu/hu.stamp
+++ /dev/null
diff --git a/help/hu/index.page b/help/hu/index.page
deleted file mode 100644
index ebe4545..0000000
--- a/help/hu/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="hu">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Oldalak szkennelése</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>A dokumentum módosítása</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>A dokumentum használata</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/hu/legal.xml b/help/hu/legal.xml
deleted file mode 100644
index 4d5b5b6..0000000
--- a/help/hu/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Ez a munka a <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</link> feltételei szerint használható.</p>
-<p>Speciális kivételként a szerzői jog tulajdonosai az Ön által választott tetszőleges feltételek mellett, korlátozás nélkül engedélyezik a dokumentumban található példakódok másolását, módosítását és terjesztését.</p>
-</license>
diff --git a/help/hu/print.page b/help/hu/print.page
deleted file mode 100644
index dbf94ea..0000000
--- a/help/hu/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Nyomtatás</title>
-
-    <p>
-    <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/hu/quality.page b/help/hu/quality.page
deleted file mode 100644
index 367352a..0000000
--- a/help/hu/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/hu/reorder.page b/help/hu/reorder.page
deleted file mode 100644
index f4b9c8b..0000000
--- a/help/hu/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Oldalak átrendezése</title>
-
-    <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>
-    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/hu/rotate.page b/help/hu/rotate.page
deleted file mode 100644
index 197d9f5..0000000
--- a/help/hu/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/hu/save.page b/help/hu/save.page
deleted file mode 100644
index 855de90..0000000
--- a/help/hu/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Mentés fájlba</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/hu/scanner.page b/help/hu/scanner.page
deleted file mode 100644
index 8ca0efe..0000000
--- a/help/hu/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Szkenner kiválasztása</title>
-
-    <p>
-    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 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/hu/scanning.page b/help/hu/scanning.page
deleted file mode 100644
index eeae6f3..0000000
--- a/help/hu/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="hu">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Oldal beolvasása</title>
-
-    <p>Egy dokumentum beolvasásához a szkennerről:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Nyissa meg a <app>Simple Scant</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>
-
-    <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>
-      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/ia/adf.page b/help/ia/adf.page
deleted file mode 100644
index ed768f4..0000000
--- a/help/ia/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Using an Automatic Document Feeder</title>
-
-    <p>
-    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>Usar un via breve de claviero</title>
-	<item>
-	  <p>Pulsa <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
-	</item>      
-      </steps>
-      
-      <steps>
-	<title>Usar un 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 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/ia/brightness-contrast.page b/help/ia/brightness-contrast.page
deleted file mode 100644
index 6b26d0e..0000000
--- a/help/ia/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/ia/crop.page b/help/ia/crop.page
deleted file mode 100644
index 0bb213a..0000000
--- a/help/ia/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Cropping</title>
-
-    <p>
-    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>Usar un clic dextere</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>Usar un 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>Usar le barra de instrumentos</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/ia/dpi.page b/help/ia/dpi.page
deleted file mode 100644
index c233717..0000000
--- a/help/ia/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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 (tacite)</p></td>
-	</tr>
-	<tr>
-		<td><p>600 dpi</p></td>
-		<td><p>600 dpi</p></td>
-	</tr>
-	<tr>
-		<td><p>1200 dpi (alte resolution)</p></td>
-		<td><p>1200 dpi (alte 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/ia/email.page b/help/ia/email.page
deleted file mode 100644
index abacc7e..0000000
--- a/help/ia/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Invio per Email</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/ia/ia.po b/help/ia/ia.po
index 355f0c2..3e13a68 100644
--- a/help/ia/ia.po
+++ b/help/ia/ia.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2017-02-18 14:12+0000\n"
 "Last-Translator: karm <melo@carmu.com>\n"
 "Language-Team: Interlingua <ia@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: 2017-02-19 05:29+0000\n"
-"X-Generator: Launchpad (build 18326)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  karm https://launchpad.net/~melo-o"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr "Ali Shtarbanov"
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Scansion de paginas"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Modification del documento"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Uso del documento"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr "Vias breve de Simple Scan"
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -359,6 +313,52 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Scansion de paginas"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Modification del documento"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Uso del documento"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr "Vias breve de Simple Scan"
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/ia/ia.stamp b/help/ia/ia.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/ia/ia.stamp
+++ /dev/null
diff --git a/help/ia/index.page b/help/ia/index.page
deleted file mode 100644
index 72442e3..0000000
--- a/help/ia/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="ia">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Scansion de paginas</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modification del documento</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Uso del documento</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Vias breve de Simple Scan</title>
-    </section>
-</page>
diff --git a/help/ia/legal.xml b/help/ia/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/ia/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/ia/print.page b/help/ia/print.page
deleted file mode 100644
index b09758b..0000000
--- a/help/ia/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Stampa</title>
-
-    <p>
-    <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/ia/quality.page b/help/ia/quality.page
deleted file mode 100644
index 7131774..0000000
--- a/help/ia/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/ia/reorder.page b/help/ia/reorder.page
deleted file mode 100644
index 5aa50a9..0000000
--- a/help/ia/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordering Pages</title>
-
-    <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>
-    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/ia/rotate.page b/help/ia/rotate.page
deleted file mode 100644
index 2884dee..0000000
--- a/help/ia/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotar un pagina</title>
-
-    <p>
-    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>Usar le clic dextere</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>Usar un 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>Rotar a sinistra</p></td>
-		<td><p><key>[</key> (left bracket)</p></td>
-	</tr>
-	<tr>
-		<td><p>Rotar a dextra</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/ia/save.page b/help/ia/save.page
deleted file mode 100644
index cddfcb7..0000000
--- a/help/ia/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Saving to a File</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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>Breve 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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/ia/scanner.page b/help/ia/scanner.page
deleted file mode 100644
index 71b1338..0000000
--- a/help/ia/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="ia">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Eliger un scanditor</title>
-
-    <p>
-    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 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/ia/scanning.page b/help/ia/scanning.page
deleted file mode 100644
index 78e5fbd..0000000
--- a/help/ia/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="ia">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scansion de un pagina</title>
-
-    <p>Scander un documento per tu scanditor:</p>
-    <steps>
-      <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>
-
-    <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>
-      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/it/adf.page b/help/it/adf.page
deleted file mode 100644
index 60dc675..0000000
--- a/help/it/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Usare un caricatore automatico di documenti</title>
-
-    <p>
-    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 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/it/brightness-contrast.page b/help/it/brightness-contrast.page
deleted file mode 100644
index ed801d3..0000000
--- a/help/it/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/it/crop.page b/help/it/crop.page
deleted file mode 100644
index 4cdc615..0000000
--- a/help/it/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Ritagliare</title>
-
-    <p>
-    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/it/dpi.page b/help/it/dpi.page
deleted file mode 100644
index d653e22..0000000
--- a/help/it/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Impostare la risoluzione dello scanner</title>
-
-    <p>
-    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/it/email.page b/help/it/email.page
deleted file mode 100644
index 1b87263..0000000
--- a/help/it/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Inviare via email</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/it/index.page b/help/it/index.page
deleted file mode 100644
index 1fe4e2d..0000000
--- a/help/it/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="it">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Manuale di Simple Scan</title>
-    
-    <section id="acquire" style="2column">
-        <title>Acquisizione delle pagine</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modificare il documento</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Usare il documento</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/it/it.po b/help/it/it.po
index b5ca31e..727eb84 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-04-26 10:46+0000\n"
 "Last-Translator: Milo Casagrande <milo.casagrande@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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -27,54 +27,6 @@ msgstr ""
 "  Milo Casagrande https://launchpad.net/~milo\n"
 "  bobol68 https://launchpad.net/~bobol68"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr "Ali Shtarbanov"
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-"<media type=\"image\" src=\"figures/icon.png\"/> Manuale di Simple Scan"
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Acquisizione delle pagine"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Modificare il documento"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Usare il documento"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -367,6 +319,54 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Manuale di Simple Scan"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Acquisizione delle pagine"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Modificare il documento"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Usare il documento"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/it/it.stamp b/help/it/it.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/it/it.stamp
+++ /dev/null
diff --git a/help/it/legal.xml b/help/it/legal.xml
deleted file mode 100644
index 4426e26..0000000
--- a/help/it/legal.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Questo lavoro è rilasciato nei termini della <link href="http://creativecommons.org/licenses/by-sa/3.0/">Licenza Creative Commons Attribution-Share Alike 3.0 Unported</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/it/print.page b/help/it/print.page
deleted file mode 100644
index 3a95b89..0000000
--- a/help/it/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Stampare</title>
-
-    <p>
-    <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>Per stampare un documento</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/it/quality.page b/help/it/quality.page
deleted file mode 100644
index dbbf94a..0000000
--- a/help/it/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Impostare la qualità dell'immagine</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/it/reorder.page b/help/it/reorder.page
deleted file mode 100644
index 13a696a..0000000
--- a/help/it/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Riordinare le pagine</title>
-
-    <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>
-    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/it/rotate.page b/help/it/rotate.page
deleted file mode 100644
index 7d66236..0000000
--- a/help/it/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Ruotare una pagina</title>
-
-    <p>
-    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/it/save.page b/help/it/save.page
deleted file mode 100644
index a669e09..0000000
--- a/help/it/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Salvare su un file</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/it/scanner.page b/help/it/scanner.page
deleted file mode 100644
index e5ceb59..0000000
--- a/help/it/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="it">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecting a Scanner</title>
-
-    <p>
-    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 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/it/scanning.page b/help/it/scanning.page
deleted file mode 100644
index adee60d..0000000
--- a/help/it/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="it">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer 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>
-
-    <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>
-      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/ja/adf.page b/help/ja/adf.page
deleted file mode 100644
index 8045133..0000000
--- a/help/ja/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Using an Automatic Document Feeder</title>
-
-    <p>
-    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 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/ja/brightness-contrast.page b/help/ja/brightness-contrast.page
deleted file mode 100644
index 34fe2dc..0000000
--- a/help/ja/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/ja/crop.page b/help/ja/crop.page
deleted file mode 100644
index d5505a2..0000000
--- a/help/ja/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Cropping</title>
-
-    <p>
-    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/ja/dpi.page b/help/ja/dpi.page
deleted file mode 100644
index 85f8d74..0000000
--- a/help/ja/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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/ja/email.page b/help/ja/email.page
deleted file mode 100644
index d162b0f..0000000
--- a/help/ja/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Sending via Email</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/ja/index.page b/help/ja/index.page
deleted file mode 100644
index 5d6b798..0000000
--- a/help/ja/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="ja">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modifying the Document</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Using the Document</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/ja/ja.po b/help/ja/ja.po
index 7efa75d..452d4ed 100644
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2012-10-08 08:05+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:31+0000\n"
+"Last-Translator: Kenichi Ito <ken.i54k@gmail.com>\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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Kenichi Ito https://launchpad.net/~ken-i54k"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr ""
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -252,7 +206,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/dpi.page:9
 msgid "Setting the Scan Resolution"
-msgstr ""
+msgstr "スキャン解像度を設定する"
 
 #. (itstool) path: page/p
 #: C/dpi.page:11
@@ -335,7 +289,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/email.page:9
 msgid "Sending via Email"
-msgstr ""
+msgstr "電子メールで送信する"
 
 #. (itstool) path: page/p
 #: C/email.page:11
@@ -359,10 +313,56 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "ページのスキャン"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "ドキュメントの修正"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "ドキュメントの使用"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
-msgstr ""
+msgstr "Creative Commons 表示-継承 3.0 非移植"
 
 #. (itstool) path: license/p
 #: C/legal.xml:3
@@ -550,7 +550,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/save.page:9
 msgid "Saving to a File"
-msgstr ""
+msgstr "ファイルの保存"
 
 #. (itstool) path: item/p
 #: C/save.page:13
@@ -654,7 +654,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/scanner.page:9
 msgid "Selecting a Scanner"
-msgstr ""
+msgstr "スキャナーの選択"
 
 #. (itstool) path: page/p
 #: C/scanner.page:11
@@ -681,12 +681,12 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/scanning.page:10
 msgid "Scanning a Page"
-msgstr ""
+msgstr "ページのスキャン"
 
 #. (itstool) path: page/p
 #: C/scanning.page:12
 msgid "To scan a document from your scanner:"
-msgstr ""
+msgstr "スキャナーからドキュメントを読み込むためには:"
 
 #. (itstool) path: item/p
 #: C/scanning.page:16
@@ -696,7 +696,7 @@ msgstr ""
 #. (itstool) path: item/p
 #: C/scanning.page:17
 msgid "Open <app>Simple Scan</app>."
-msgstr ""
+msgstr "<app>Simple Scan</app> を開く。"
 
 #. (itstool) path: item/p
 #: C/scanning.page:18
diff --git a/help/ja/ja.stamp b/help/ja/ja.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/ja/ja.stamp
+++ /dev/null
diff --git a/help/ja/legal.xml b/help/ja/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/ja/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/ja/print.page b/help/ja/print.page
deleted file mode 100644
index 508e5b9..0000000
--- a/help/ja/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Printing</title>
-
-    <p>
-    <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/ja/quality.page b/help/ja/quality.page
deleted file mode 100644
index 5801079..0000000
--- a/help/ja/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/ja/reorder.page b/help/ja/reorder.page
deleted file mode 100644
index 59d7e75..0000000
--- a/help/ja/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordering Pages</title>
-
-    <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>
-    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/ja/rotate.page b/help/ja/rotate.page
deleted file mode 100644
index 46ce93f..0000000
--- a/help/ja/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/ja/save.page b/help/ja/save.page
deleted file mode 100644
index 4009b28..0000000
--- a/help/ja/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Saving to a File</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/ja/scanner.page b/help/ja/scanner.page
deleted file mode 100644
index b63bddd..0000000
--- a/help/ja/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="ja">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecting a Scanner</title>
-
-    <p>
-    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 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/ja/scanning.page b/help/ja/scanning.page
deleted file mode 100644
index d35c0b4..0000000
--- a/help/ja/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="ja">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer 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>
-
-    <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>
-      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/ku/adf.page b/help/ku/adf.page
deleted file mode 100644
index a5c8264..0000000
--- a/help/ku/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Using an Automatic Document Feeder</title>
-
-    <p>
-    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 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/ku/brightness-contrast.page b/help/ku/brightness-contrast.page
deleted file mode 100644
index bbbc657..0000000
--- a/help/ku/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/ku/crop.page b/help/ku/crop.page
deleted file mode 100644
index 84855d2..0000000
--- a/help/ku/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Cropping</title>
-
-    <p>
-    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/ku/dpi.page b/help/ku/dpi.page
deleted file mode 100644
index c61460c..0000000
--- a/help/ku/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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/ku/email.page b/help/ku/email.page
deleted file mode 100644
index d921a7d..0000000
--- a/help/ku/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Sending via Email</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/ku/index.page b/help/ku/index.page
deleted file mode 100644
index ec63a7c..0000000
--- a/help/ku/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="ku">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modifying the Document</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Using the Document</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/ku/ku.po b/help/ku/ku.po
index d0cb99b..c57fb35 100644
--- a/help/ku/ku.po
+++ b/help/ku/ku.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2017-02-28 22:57+0000\n"
 "Last-Translator: Rokar ✌ <Unknown>\n"
 "Language-Team: Kurdish <ku@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: 2017-03-01 05:37+0000\n"
-"X-Generator: Launchpad (build 18329)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Rokar ✌ https://launchpad.net/~rokarali"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr ""
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -359,6 +313,52 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr ""
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/ku/ku.stamp b/help/ku/ku.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/ku/ku.stamp
+++ /dev/null
diff --git a/help/ku/legal.xml b/help/ku/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/ku/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/ku/print.page b/help/ku/print.page
deleted file mode 100644
index 787ef31..0000000
--- a/help/ku/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Çapkirin</title>
-
-    <p>
-    <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/ku/quality.page b/help/ku/quality.page
deleted file mode 100644
index 4e3fe1c..0000000
--- a/help/ku/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/ku/reorder.page b/help/ku/reorder.page
deleted file mode 100644
index d912ab4..0000000
--- a/help/ku/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordering Pages</title>
-
-    <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>
-    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/ku/rotate.page b/help/ku/rotate.page
deleted file mode 100644
index f668b7c..0000000
--- a/help/ku/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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>Bizivirîne Çepê</p></td>
-		<td><p><key>[</key> (left bracket)</p></td>
-	</tr>
-	<tr>
-		<td><p>Bizivirîne Rastê</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/ku/save.page b/help/ku/save.page
deleted file mode 100644
index dda4440..0000000
--- a/help/ku/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Saving to a File</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/ku/scanner.page b/help/ku/scanner.page
deleted file mode 100644
index c6bfa0b..0000000
--- a/help/ku/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="ku">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecting a Scanner</title>
-
-    <p>
-    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 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/ku/scanning.page b/help/ku/scanning.page
deleted file mode 100644
index 6cd5021..0000000
--- a/help/ku/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="ku">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer 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>
-
-    <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>
-      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/meson.build b/help/meson.build
new file mode 100644
index 0000000..015823d
--- /dev/null
+++ b/help/meson.build
@@ -0,0 +1,40 @@
+languages = [ 'ar',
+              'bg',
+              'cs',
+              'de',
+              'en_GB', 'es', 'eu',
+              'fi', 'fr',
+              'hr', 'hu',
+              'ia',
+              'it',
+              'ja',
+              'ku',
+              'nb', 'nl',
+              'pl', 'pt_BR',
+              'ru',
+              'sk', 'sl', 'sr', 'sv',
+              'uk',
+              'zh_TW' ]
+
+# 'delete.page'
+# 'external.page'
+
+gnome.yelp ('simple-scan',
+            sources: [ 'adf.page',
+                       'brightness-contrast.page',
+                       'crop.page',
+                       'dpi.page',
+                       'email.page',
+                       'index.page',
+                       'legal.xml',          
+                       'print.page',
+                       'quality.page',
+                       'reorder.page',
+                       'rotate.page',
+                       'save.page',
+                       'scanner.page',
+                       'scanning.page' ],
+            media: [ 'figures/icon.png',
+                     'figures/preferences.png',
+                     'figures/scan_toolbar.png' ],
+            languages: languages)
diff --git a/help/nb/adf.page b/help/nb/adf.page
deleted file mode 100644
index ed56f71..0000000
--- a/help/nb/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Using an Automatic Document Feeder</title>
-
-    <p>
-    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 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/nb/brightness-contrast.page b/help/nb/brightness-contrast.page
deleted file mode 100644
index e891e69..0000000
--- a/help/nb/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/nb/crop.page b/help/nb/crop.page
deleted file mode 100644
index 03946f6..0000000
--- a/help/nb/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Cropping</title>
-
-    <p>
-    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/nb/dpi.page b/help/nb/dpi.page
deleted file mode 100644
index 4bcb7b1..0000000
--- a/help/nb/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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/nb/email.page b/help/nb/email.page
deleted file mode 100644
index 51e8cd8..0000000
--- a/help/nb/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Sending via Email</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/nb/index.page b/help/nb/index.page
deleted file mode 100644
index 3ea7562..0000000
--- a/help/nb/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="nb">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modifying the Document</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Using the Document</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/nb/legal.xml b/help/nb/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/nb/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/nb/nb.po b/help/nb/nb.po
index beddc9b..9104d00 100644
--- a/help/nb/nb.po
+++ b/help/nb/nb.po
@@ -7,68 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-03-30 01:20+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  kingu https://launchpad.net/~comradekingu"
-
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr ""
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
+"  Allan Nordhøy https://launchpad.net/~comradekingu"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -359,6 +313,52 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr ""
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/nb/nb.stamp b/help/nb/nb.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/nb/nb.stamp
+++ /dev/null
diff --git a/help/nb/print.page b/help/nb/print.page
deleted file mode 100644
index 922197a..0000000
--- a/help/nb/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Printing</title>
-
-    <p>
-    <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/nb/quality.page b/help/nb/quality.page
deleted file mode 100644
index 264ad6f..0000000
--- a/help/nb/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/nb/reorder.page b/help/nb/reorder.page
deleted file mode 100644
index f74529b..0000000
--- a/help/nb/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordering Pages</title>
-
-    <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>
-    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/nb/rotate.page b/help/nb/rotate.page
deleted file mode 100644
index c3958e6..0000000
--- a/help/nb/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/nb/save.page b/help/nb/save.page
deleted file mode 100644
index 2cc469a..0000000
--- a/help/nb/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Saving to a File</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/nb/scanner.page b/help/nb/scanner.page
deleted file mode 100644
index 07a7cdd..0000000
--- a/help/nb/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="nb">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecting a Scanner</title>
-
-    <p>
-    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 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/nb/scanning.page b/help/nb/scanning.page
deleted file mode 100644
index c5a55da..0000000
--- a/help/nb/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="nb">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer 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>
-
-    <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>
-      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/nl/adf.page b/help/nl/adf.page
deleted file mode 100644
index 1cbd16d..0000000
--- a/help/nl/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Using an Automatic Document Feeder</title>
-
-    <p>
-    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 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/nl/brightness-contrast.page b/help/nl/brightness-contrast.page
deleted file mode 100644
index 665de87..0000000
--- a/help/nl/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/nl/crop.page b/help/nl/crop.page
deleted file mode 100644
index 650aed0..0000000
--- a/help/nl/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Cropping</title>
-
-    <p>
-    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/nl/dpi.page b/help/nl/dpi.page
deleted file mode 100644
index c8c62fd..0000000
--- a/help/nl/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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/nl/email.page b/help/nl/email.page
deleted file mode 100644
index bd26600..0000000
--- a/help/nl/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Sending via Email</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/nl/index.page b/help/nl/index.page
deleted file mode 100644
index 5b5164d..0000000
--- a/help/nl/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="nl">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modifying the Document</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Using the Document</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/nl/legal.xml b/help/nl/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/nl/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/nl/nl.po b/help/nl/nl.po
index 5ac5be6..713dd8b 100644
--- a/help/nl/nl.po
+++ b/help/nl/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2015-12-08 15:59+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Justin https://launchpad.net/~jusgje"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr ""
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -359,6 +313,52 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr ""
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/nl/nl.stamp b/help/nl/nl.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/nl/nl.stamp
+++ /dev/null
diff --git a/help/nl/print.page b/help/nl/print.page
deleted file mode 100644
index d787b97..0000000
--- a/help/nl/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Printing</title>
-
-    <p>
-    <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/nl/quality.page b/help/nl/quality.page
deleted file mode 100644
index db5c75f..0000000
--- a/help/nl/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/nl/reorder.page b/help/nl/reorder.page
deleted file mode 100644
index 8a33254..0000000
--- a/help/nl/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordering Pages</title>
-
-    <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>
-    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/nl/rotate.page b/help/nl/rotate.page
deleted file mode 100644
index d4ec756..0000000
--- a/help/nl/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/nl/save.page b/help/nl/save.page
deleted file mode 100644
index 690b29d..0000000
--- a/help/nl/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Saving to a File</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/nl/scanner.page b/help/nl/scanner.page
deleted file mode 100644
index b82c534..0000000
--- a/help/nl/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="nl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecting a Scanner</title>
-
-    <p>
-    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 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/nl/scanning.page b/help/nl/scanning.page
deleted file mode 100644
index b4b32a2..0000000
--- a/help/nl/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="nl">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer 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>
-
-    <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>
-      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/pl/adf.page b/help/pl/adf.page
deleted file mode 100644
index 01a1e02..0000000
--- a/help/pl/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Korzystanie z automatycznego podajnika</title>
-
-    <p>
-    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>Użyj skrótu klawiszowego</title>
-	<item>
-	  <p>Wciśnij <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
-	</item>      
-      </steps>
-      
-      <steps>
-	<title>Użyj 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>Wybierz "Wszystkie strony z podajnika".</p>
-	  <media type="image" src="figures/scan_toolbar.png"/>
-	</item>
-      </steps>
-    
-    
-    <note style="tip">
-    <p>
-    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/pl/brightness-contrast.page b/help/pl/brightness-contrast.page
deleted file mode 100644
index 555fc1c..0000000
--- a/help/pl/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/pl/crop.page b/help/pl/crop.page
deleted file mode 100644
index 6c41246..0000000
--- a/help/pl/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Kadrowanie</title>
-
-    <p>
-    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>Użyj prawego przycisku myszy</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>Użyj 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/pl/dpi.page b/help/pl/dpi.page
deleted file mode 100644
index 802e136..0000000
--- a/help/pl/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Ustawianie rozdzielczości skanowania</title>
-
-    <p>
-    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/pl/email.page b/help/pl/email.page
deleted file mode 100644
index 2ee9816..0000000
--- a/help/pl/email.page
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Przesyłanie skanów e-mailem</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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>Więcej informacji o obsługiwanych formatach plików można uzyskać klikając na link: <link xref="save"/>.</p>
-</page>
diff --git a/help/pl/figures/preferences.png b/help/pl/figures/preferences.png
new file mode 100644
index 0000000..b11c96b
--- /dev/null
+++ b/help/pl/figures/preferences.png
diff --git a/help/pl/figures/scan_toolbar.png b/help/pl/figures/scan_toolbar.png
new file mode 100644
index 0000000..eaeb089
--- /dev/null
+++ b/help/pl/figures/scan_toolbar.png
diff --git a/help/pl/index.page b/help/pl/index.page
deleted file mode 100644
index 14dc6ad..0000000
--- a/help/pl/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="pl">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Podręcznik Prostego skanowania</title>
-    
-    <section id="acquire" style="2column">
-        <title>Skanowanie stron</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modyfikowanie dokumentu</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Używanie dokumentu</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Skróty Prostego skanowania</title>
-    </section>
-</page>
diff --git a/help/pl/legal.xml b/help/pl/legal.xml
deleted file mode 100644
index 43a0b49..0000000
--- a/help/pl/legal.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Ta praca jest licencjonowana zgodnie z <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/pl/pl.po b/help/pl/pl.po
index d70b6eb..2daf4a9 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -1,83 +1,34 @@
-# Polish translation for simple-scan
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Polish translation for simple-scan help.
+# Copyright © 2017 the simple-scan authors.
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# Piotr Drąg <piotrdrag@gmail.com>, 2017.
+# Aviary.pl <community-poland@mozilla.org>, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2016-11-18 17:03+0000\n"
-"Last-Translator: Piotr Strębski <strebski@o2.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
+"Project-Id-Version: simple-scan-help\n"
+"POT-Creation-Date: 2017-09-11 03:50+0000\n"
+"PO-Revision-Date: 2017-09-20 04:44+0200\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+"Language-Team: Polish <community-poland@mozilla.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
-"  Piotr Strębski https://launchpad.net/~strebski\n"
-"  Łukasz Cieliński https://launchpad.net/~lukasc-t"
-
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr "Ali Shtarbanov"
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-"<media type=\"image\" src=\"figures/icon.png\"/> Podręcznik Prostego "
-"skanowania"
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Skanowanie stron"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Modyfikowanie dokumentu"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Używanie dokumentu"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr "Skróty Prostego skanowania"
+"Piotr Drąg <piotrdrag@gmail.com>, 2017\n"
+"Aviary.pl <community-poland@mozilla.org>, 2017"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
-msgstr "Korzystanie z automatycznego podajnika"
+msgstr "Używanie automatycznego podajnika"
 
 #. (itstool) path: page/p
 #: C/adf.page:11
@@ -85,53 +36,54 @@ msgid ""
 "If your scanner features an Automatic Document Feeder (ADF) you can scan all "
 "the pages from the feeder via one of following methods:"
 msgstr ""
+"Jeśli skaner ma automatyczny podajnik, to można go użyć do zeskanowania "
+"wszystkich stron za pomocą jednego z tych sposobów:"
 
 #. (itstool) path: steps/title
-#: C/adf.page:17
+#: C/adf.page:16
 msgid "Use a Keyboard Shortcut"
-msgstr "Użyj skrótu klawiszowego"
+msgstr "Skrót klawiszowy"
 
 #. (itstool) path: item/p
-#: C/adf.page:19
+#: C/adf.page:18
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr "Wciśnij <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgstr "Naciśnij klawisze <keyseq><key>Ctrl</key><key>F</key></keyseq>"
 
 #. (itstool) path: steps/title
-#: C/adf.page:24
-#: C/crop.page:27
-#: C/rotate.page:28
+#: C/adf.page:23 C/crop.page:27 C/rotate.page:28
 msgid "Use a Menu"
-msgstr "Użyj menu"
+msgstr "Menu"
 
 #. (itstool) path: item/p
-#: C/adf.page:26
+#: C/adf.page:25
 msgid ""
 "Navigate to <guiseq><gui>Document</gui> <gui>Scan</gui><gui>All Pages From "
 "Feeder</gui></guiseq>."
 msgstr ""
+"Przejdź do <guiseq><gui>Dokument</gui> <gui>Skanowanie</gui><gui>Wszystkie "
+"strony z podajnika</gui></guiseq>."
 
 #. (itstool) path: steps/title
-#: C/adf.page:33
+#: C/adf.page:32
 msgid "Use the Toolbar Buttons"
-msgstr ""
+msgstr "Przyciski paska narzędziowego"
 
 #. (itstool) path: item/p
-#: C/adf.page:35
+#: C/adf.page:34
 msgid "Click on the arrow to the right of the \"Scan\" button."
-msgstr ""
+msgstr "Kliknij strzałkę po prawej stronie przycisku „Skanuj”."
 
 #. (itstool) path: item/p
-#: C/adf.page:38
+#: C/adf.page:37
 msgid "Choose \"All Pages From Feeder\"."
-msgstr "Wybierz \"Wszystkie strony z podajnika\"."
+msgstr "Wybierz „Wszystkie strony z podajnika”."
 
 #. (itstool) path: item/media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:39
-#: C/scanning.page:20
+#: C/adf.page:38 C/scanning.page:20
 msgctxt "_"
 msgid ""
 "external ref='figures/scan_toolbar.png' "
@@ -141,12 +93,15 @@ msgstr ""
 "md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 
 #. (itstool) path: note/p
-#: C/adf.page:45
+#: C/adf.page:44
 msgid ""
 "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."
 msgstr ""
+"Domyślnie obie strony kartki zostaną zeskanowane, jeśli skaner ma tę "
+"funkcję. Można wybrać skanowanie tylko jednej strony w menu "
+"<guiseq><gui>Dokument</gui><gui>Preferencje</gui></guiseq>."
 
 #. (itstool) path: note/media
 #. (itstool) path: page/media
@@ -154,9 +109,7 @@ msgstr ""
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:49
-#: C/dpi.page:16
-#: C/scanner.page:14
+#: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
 msgid ""
 "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
@@ -166,7 +119,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
 msgid "Setting brightness and Contrast"
-msgstr ""
+msgstr "Ustawianie jasności i kontrastu"
 
 #. (itstool) path: page/p
 #: C/brightness-contrast.page:11
@@ -176,6 +129,10 @@ msgid ""
 "settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> "
 "menu."
 msgstr ""
+"Niektóre skanery umożliwiają dostosowanie jasności i kontrastu podczas "
+"skanowania. Jeśli zeskanowane strony są za ciemne lub za jasne, to można "
+"dostosować te ustawienia w menu <guiseq><gui>Dokument</gui><gui>Preferencje</"
+"gui></guiseq>."
 
 #. (itstool) path: page/title
 #: C/crop.page:9
@@ -192,16 +149,22 @@ msgid ""
 "used shown in gray. You can enable crop and choose the desired dimensions "
 "via one of the following methods:"
 msgstr ""
+"Funkcja kadrowania programu <app>Proste skanowanie</app> umożliwia użycie "
+"tylko części zeskanowanego obrazu. Można włączyć kadrowanie przed lub po "
+"zeskanowaniu strony, i zawsze można zmienić wymiary kadrowanej części. Po "
+"włączeniu kadrowania pojawia się maska nad bieżącą stroną, a nieużywany "
+"obszar jest szary. Można to zrobić za pomoc jednego z tych sposobów:"
 
 #. (itstool) path: steps/title
 #: C/crop.page:19
 msgid "Use a Right Click"
-msgstr "Użyj prawego przycisku myszy"
+msgstr "Kliknięcie prawym przyciskiem myszy"
 
 #. (itstool) path: item/p
 #: C/crop.page:20
 msgid "Right click anywhere on the image area and select \"Crop\"."
 msgstr ""
+"Kliknij gdziekolwiek na obrazie prawym przyciskiem myszy i wybierz „Kadruj”."
 
 #. (itstool) path: item/p
 #: C/crop.page:21
@@ -209,17 +172,19 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually set "
 "the crop frame's dimensions by dragging its borders."
 msgstr ""
+"Wybierz jeden z ustalonych wymiarów lub „Niestandardowy”, aby ręcznie "
+"ustawić wymiary przeciągając krawędzie ramki."
 
 #. (itstool) path: item/p
-#: C/crop.page:23
-#: C/crop.page:30
+#: C/crop.page:23 C/crop.page:30
 msgid "Click and hold the frame, then move it to the desired position."
 msgstr ""
+"Kliknij i przytrzymaj ramkę, a następnie przenieś ją w odpowiednie miejsce."
 
 #. (itstool) path: item/p
 #: C/crop.page:28
 msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
-msgstr ""
+msgstr "Przejdź do menu <guiseq><gui>Strona</gui><gui>Kadruj</gui></guiseq>."
 
 #. (itstool) path: item/p
 #: C/crop.page:29
@@ -227,16 +192,18 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually adjust "
 "the frame's dimensions by dragging its borders."
 msgstr ""
+"Wybierz jeden z ustalonych wymiarów lub „Niestandardowy”, aby ręcznie "
+"dostosować wymiary przeciągając krawędzie ramki."
 
 #. (itstool) path: steps/title
 #: C/crop.page:34
 msgid "Use the Toolbar"
-msgstr ""
+msgstr "Pasek narzędziowy"
 
 #. (itstool) path: item/p
 #: C/crop.page:35
 msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
-msgstr ""
+msgstr "Kliknij przycisk <gui>Kadruj</gui> na pasku narzędziowym."
 
 #. (itstool) path: note/p
 #: C/crop.page:36
@@ -244,17 +211,20 @@ msgid ""
 "This is the same as choosing \"Custom\" in step 2 of the aforementioned "
 "methods."
 msgstr ""
+"To odpowiednik wybrania „Niestandardowy” w drugim kroku poprzednich sposobów."
 
 #. (itstool) path: item/p
 #: C/crop.page:38
 msgid ""
 "Drag the borders of the frame to set the desired dimensions and position."
 msgstr ""
+"Przeciągnij krawędzie ramki, aby ustawić odpowiednie wymiary i położenie."
 
 #. (itstool) path: note/p
 #: C/crop.page:42
 msgid "Each new scanned page will use the previous crop."
 msgstr ""
+"Każda nowo zeskanowana strona będzie używała poprzednio wybranego kadrowania."
 
 #. (itstool) path: page/title
 #: C/dpi.page:9
@@ -266,9 +236,13 @@ msgstr "Ustawianie rozdzielczości skanowania"
 msgid ""
 "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."
+"You can change these settings from the <guiseq><gui>Document</"
+"gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Domyślna rozdzielczość dla dokumentów typu <gui><em>tekst</em></gui> to 150 "
+"DPI (punktów na cal), a dla typu <gui><em>zdjęcie</em></gui> to 300 DPI. "
+"Można zmienić te ustawienia w menu <guiseq><gui>Dokument</"
+"gui><gui>Preferencje</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/dpi.page:18
@@ -276,60 +250,58 @@ msgid ""
 "The available scanning resolutions for both document types (Text and Photo) "
 "are the same and are listed in the following table:"
 msgstr ""
+"Dostępne rozdzielczości skanowania dla obu typów dokumentów (tekst lub "
+"zdjęcie) są takie same:"
 
 #. (itstool) path: td/p
 #: C/dpi.page:23
 msgid "<em>Text Resolution</em>"
-msgstr ""
+msgstr "<em>Rozdzielczość tekstu</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:24
 msgid "<em>Photo Resolution</em>"
-msgstr ""
+msgstr "<em>Rozdzielczość zdjęć</em>"
 
 #. (itstool) path: td/p
-#: C/dpi.page:27
-#: C/dpi.page:28
+#: C/dpi.page:27 C/dpi.page:28
 msgid "75 dpi (draft)"
-msgstr ""
+msgstr "75 DPI (szkic)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:31
 msgid "150 dpi (default)"
-msgstr ""
+msgstr "150 DPI (domyślne)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:32
 msgid "150 dpi"
-msgstr ""
+msgstr "150 DPI"
 
 #. (itstool) path: td/p
 #: C/dpi.page:35
 msgid "300 dpi"
-msgstr ""
+msgstr "300 DPI"
 
 #. (itstool) path: td/p
 #: C/dpi.page:36
 msgid "300 dpi (default)"
-msgstr ""
+msgstr "300 DPI (domyślne)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:39
-#: C/dpi.page:40
+#: C/dpi.page:39 C/dpi.page:40
 msgid "600 dpi"
-msgstr ""
+msgstr "600 DPI"
 
 #. (itstool) path: td/p
-#: C/dpi.page:43
-#: C/dpi.page:44
+#: C/dpi.page:43 C/dpi.page:44
 msgid "1200 dpi (high resolution)"
-msgstr ""
+msgstr "1200 DPI (wysoka rozdzielczość)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:47
-#: C/dpi.page:48
+#: C/dpi.page:47 C/dpi.page:48
 msgid "2400 dpi"
-msgstr ""
+msgstr "2400 DPI"
 
 #. (itstool) path: note/p
 #: C/dpi.page:52
@@ -338,45 +310,93 @@ msgid ""
 "while <gui><em>Photo</em></gui> documents are always scanned in color, at "
 "any resolution!"
 msgstr ""
+"Dokumenty typu <gui><em>tekst</em></gui> są zawsze skanowane na czarno-"
+"biało, a dokumenty typu <gui><em>zdjęcie</em></gui> są zawsze skanowane "
+"w kolorze, niezależnie od rozdzielczości."
 
 #. (itstool) path: page/title
 #: C/email.page:9
 msgid "Sending via Email"
-msgstr "Przesyłanie skanów e-mailem"
+msgstr "Wysyłanie pocztą"
 
 #. (itstool) path: page/p
 #: C/email.page:11
 msgid ""
-"To email the current document use the "
-"<guiseq><gui>Document</gui><gui>Email</gui></guiseq> menu "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be "
-"opened with a new message containing the scanned document as an attachment."
+"To email the current document use the <guiseq><gui>Document</gui><gui>Email</"
+"gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your "
+"email program will be opened with a new message containing the scanned "
+"document as an attachment."
 msgstr ""
+"Aby wysłać bieżący dokument pocztą, użyj menu <guiseq><gui>Dokument</"
+"gui><gui>E-mail</gui></guiseq> (<keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>). Zostanie otwarty klient poczty z nową wiadomością zawierającą "
+"zeskanowany dokument jako załącznik."
 
 #. (itstool) path: page/p
 #: C/email.page:16
 msgid ""
 "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."
+"attachment for each page. Conversely, if the document type was set to \"Photo"
+"\", the email will have a JPEG attachment for each page."
 msgstr ""
+"Jeśli typ dokumentu jest ustawiony na „tekst”, to wiadomość będzie miała "
+"załącznik PDF dla każdej strony. Jeśli ustawiono „zdjęcie”, to wiadomość "
+"będzie miała załącznik JPEG dla każdej strony."
 
 #. (itstool) path: page/p
 #: C/email.page:21
 msgid "See <link xref=\"save\"/> for more information about file formats."
-msgstr ""
-"Więcej informacji o obsługiwanych formatach plików można uzyskać klikając na "
-"link: <link xref=\"save\"/>."
+msgstr "<link xref=\"save\"/> zawiera więcej informacji o formatach plików."
+
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr "<media type=\"image\" src=\"figures/icon.png\"/> Proste skanowanie"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Skanowanie stron"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Modyfikowanie dokumentu"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Używanie dokumentu"
 
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
-msgstr ""
+msgstr "Creative Commons Attribution-Share Alike 3.0 Unported"
 
 #. (itstool) path: license/p
 #: C/legal.xml:3
 msgid "This work is licensed under a <_:link-1/>."
-msgstr "Ta praca jest licencjonowana zgodnie z <_:link-1/>."
+msgstr "Na warunkach licencji <_:link-1/>."
 
 #. (itstool) path: license/p
 #: C/legal.xml:6
@@ -385,6 +405,9 @@ msgid ""
 "modify, and distribute the example code contained in this document under the "
 "terms of your choosing, without restriction."
 msgstr ""
+"W drodze specjalnego wyjątku posiadacze praw autorskich udzielają pozwolenia "
+"na kopiowanie, modyfikowanie i rozprowadzanie przykładowego kodu zawartego "
+"w tej dokumentacji na dowolnych warunkach, bez ograniczeń."
 
 #. (itstool) path: page/title
 #: C/print.page:9
@@ -399,11 +422,15 @@ msgid ""
 "<app>Simple Scan</app> a very convenient tool for making copies of documents "
 "or photos."
 msgstr ""
+"<app>Proste skanowanie</app> umożliwia drukowanie zeskanowanego dokumentu "
+"bezpośrednio z programu, bez potrzeby zapisywania. Dzięki temu program "
+"<app>Proste skanowanie</app> jest bardzo przydatny do tworzenia kopii "
+"dokumentów i zdjęć."
 
 #. (itstool) path: steps/title
 #: C/print.page:17
 msgid "To Print a Document"
-msgstr ""
+msgstr "Drukowanie dokumentu"
 
 #. (itstool) path: item/p
 #: C/print.page:19
@@ -412,6 +439,9 @@ msgid ""
 "the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>. This "
 "will open the \"Print\" dialog box."
 msgstr ""
+"Przejdź do menu <guiseq><gui>Dokument</gui><gui>Wydrukuj</gui> </guiseq> lub "
+"użyj skrótu klawiszowego <keyseq><key>Ctrl</key><key>P</key></keyseq>. "
+"Otworzy to okno„Wydruk”."
 
 #. (itstool) path: item/p
 #: C/print.page:25
@@ -419,24 +449,31 @@ msgid ""
 "From the \"Print\" dialog box choose your desired printing settings and/or "
 "Print Preview the document, then press the \"Print\" button."
 msgstr ""
+"W oknie „Wydruk” wybierz ustawienia drukowania lub wyświetl podgląd wydruku, "
+"a następnie kliknij przycisk „Wydrukuj”."
 
 #. (itstool) path: page/title
 #: C/quality.page:9
 msgid "Setting the Image Quality"
-msgstr ""
+msgstr "Ustawianie jakości obrazu"
 
 #. (itstool) path: page/p
 #: C/quality.page:11
 msgid ""
 "You can adjust the image quality that is used when the scan is converted to "
-"a file by changing this setting in the "
-"<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu. Using a low "
-"quality will result in a small file size but may show some blurring or "
-"blockiness in the image. A high quality will keep all the scanned "
-"information but require a larger file size. See the <link "
-"href=\"https://en.wikipedia.org/wiki/Lossy_compression\">Lossy compression "
-"Wikipedia page</link> for more information."
-msgstr ""
+"a file by changing this setting in the save dialog. Using a low quality will "
+"result in a small file size but may show some blurring or blockiness in the "
+"image. A high quality will keep all the scanned information but require a "
+"larger file size. See the <link href=\"https://en.wikipedia.org/wiki/"
+"Lossy_compression\">Lossy compression Wikipedia page</link> for more "
+"information."
+msgstr ""
+"Można dostosować jakość obrazu używaną podczas konwertowania wyniku "
+"skanowania do pliku zmieniając to ustawienie w oknie zapisywania. Użycie "
+"niskiej jakości spowoduje mniejszy rozmiar pliku, ale obraz może być "
+"rozmyty. Wysoka jakość zachowa wszystkie zeskanowane informacje, ale wymaga "
+"większego rozmiaru pliku. <link href=\"https://pl.wikipedia.org/wiki/"
+"Kompresja_stratna\">Wikipedia</link> zawiera więcej informacji."
 
 #. (itstool) path: page/title
 #: C/reorder.page:9
@@ -449,6 +486,8 @@ msgid ""
 "To move a page, right click on it and choose <gui><em>Move Left</em></gui> "
 "or <gui><em>Move Right</em></gui>."
 msgstr ""
+"Aby przenieść stronę, kliknij ją prawym przyciskiem myszy i wybierz "
+"<gui><em>Przesuń w lewo</em></gui> lub <gui><em>Przesuń w prawo</em></gui>."
 
 #. (itstool) path: page/p
 #: C/reorder.page:16
@@ -457,11 +496,14 @@ msgid ""
 "<gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "
 "\"Page\" menu."
 msgstr ""
+"Można też przenieść stronę najpierw ją zaznaczając, a następnie wybierając "
+"<gui><em>Przesuń w lewo</em></gui> lub <gui><em>Przesuń w prawo</em></gui> "
+"w menu „Strona”."
 
 #. (itstool) path: page/title
 #: C/rotate.page:9
 msgid "Rotating a Page"
-msgstr ""
+msgstr "Obracanie strony"
 
 #. (itstool) path: page/p
 #: C/rotate.page:11
@@ -470,18 +512,18 @@ msgid ""
 "before or after scanning the page. Currently, there are four ways to rotate "
 "a page:"
 msgstr ""
+"<app>Proste skanowanie</app> umożliwia obrócenie strony przed lub po jej "
+"zeskanowaniu. Obecnie są cztery sposoby obracania:"
 
 #. (itstool) path: steps/title
 #: C/rotate.page:17
 msgid "Use Toolbar Buttons"
-msgstr ""
+msgstr "Przyciski paska narzędziowego"
 
 #. (itstool) path: item/p
-#: C/rotate.page:18
-#: C/rotate.page:29
-#: C/rotate.page:35
+#: C/rotate.page:18 C/rotate.page:29 C/rotate.page:35
 msgid "Select the page you want to rotate by clicking on it once."
-msgstr ""
+msgstr "Wybierz stronę do obrócenia klikając ją raz."
 
 #. (itstool) path: item/p
 #: C/rotate.page:19
@@ -489,72 +531,74 @@ msgid ""
 "Press one of the arrows on the toolbar to rotate the page in the desired "
 "direction."
 msgstr ""
+"Kliknij jedną ze strzałek na pasku narzędziowym, aby obrócić stronę w danym "
+"kierunku."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:22
 msgid "Use Right Click"
-msgstr ""
+msgstr "Kliknięcie prawym przyciskiem myszy"
 
 #. (itstool) path: item/p
 #: C/rotate.page:23
 msgid "Right click on the page you want to rotate."
-msgstr ""
+msgstr "Kliknij stronę do obrócenia prawym przyciskiem myszy."
 
 #. (itstool) path: item/p
 #: C/rotate.page:24
 msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
-msgstr ""
+msgstr "Wybierz „Obróć w lewo” lub „Obróć w prawo” z menu kontekstowego."
 
 #. (itstool) path: item/p
 #: C/rotate.page:30
-msgid ""
-"Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
-msgstr ""
+msgid "Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
+msgstr "Kliknij menu „Strona” i wybierz „Obróć w lewo” lub „Obróć w prawo”."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:34
 msgid "Use Shortcuts"
-msgstr ""
+msgstr "Skróty"
 
 #. (itstool) path: item/p
 #: C/rotate.page:36
 msgid "Press one of the following shortcut keys:"
-msgstr ""
+msgstr "Naciśnij jeden z tych skrótów klawiszowych:"
 
 #. (itstool) path: td/p
 #: C/rotate.page:39
 msgid "<em>Command</em>"
-msgstr ""
+msgstr "<em>Polecenie</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:40
 msgid "<em>Shortcut Key</em>"
-msgstr ""
+msgstr "<em>Klawisz skrótu</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:43
 msgid "Rotate Left"
-msgstr ""
+msgstr "Obrót w lewo"
 
 #. (itstool) path: td/p
 #: C/rotate.page:44
 msgid "<key>[</key> (left bracket)"
-msgstr ""
+msgstr "<key>[</key> (lewy nawias kwadratowy)"
 
 #. (itstool) path: td/p
 #: C/rotate.page:47
 msgid "Rotate Right"
-msgstr ""
+msgstr "Obrót w prawo"
 
 #. (itstool) path: td/p
 #: C/rotate.page:48
 msgid "<key>]</key> (right bracket)"
-msgstr ""
+msgstr "<key>]</key> (prawy nawias kwadratowy)"
 
 #. (itstool) path: note/p
 #: C/rotate.page:54
 msgid "Each new scanned page will use the previous rotation."
 msgstr ""
+"Każda nowo zeskanowana strona będzie używała poprzednio wybranego obrotu."
 
 #. (itstool) path: page/title
 #: C/save.page:9
@@ -567,6 +611,9 @@ msgid ""
 "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>)."
 msgstr ""
+"Przejdź do menu <guiseq><gui>Dokument</gui><gui>Zapisz jako</gui></guiseq> "
+"(lub naciśnij klawisze <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></"
+"keyseq>)."
 
 #. (itstool) path: item/p
 #: C/save.page:18
@@ -574,31 +621,33 @@ msgid ""
 "From the \"Save As\" dialog box, choose one of the supported file types, or "
 "simply change the extension in the \"Name\" field."
 msgstr ""
+"W oknie „Zapisz jako” wybierz jeden z obsługiwanych typów pliku lub po "
+"prostu zmień rozszerzenie w polu „Nazwa”."
 
 #. (itstool) path: item/p
 #: C/save.page:23
 msgid "Press the \"Save\" button."
-msgstr ""
+msgstr "Kliknij przycisk „Zapisz”."
 
 #. (itstool) path: table/title
 #: C/save.page:29
 msgid "Supported File Types"
-msgstr ""
+msgstr "Obsługiwane typy plików"
 
 #. (itstool) path: td/p
 #: C/save.page:31
 msgid "<em>Type</em>"
-msgstr ""
+msgstr "<em>Typ</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:32
 msgid "<em>Brief Description</em>"
-msgstr ""
+msgstr "<em>Krótki opis</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:35
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #. (itstool) path: td/p
 #: C/save.page:36
@@ -610,6 +659,12 @@ msgid ""
 "<link href=\"http://en.wikipedia.org/wiki/pdf\">PDF Wikipedia page</link> "
 "for more information."
 msgstr ""
+"Plik PDF może zawierać wiele stron, jak książka, i jest łatwy "
+"w rozpowszechnianiu. Tylko mała liczba programów systemu Linux może "
+"modyfikować dokumenty PDF, więc ten format jest zalecany głównie do "
+"archiwizowania. Rozmiar dokumentu PDF zależy od <link xref=\"quality"
+"\">jakości obrazu</link>. <link href=\"https://pl.wikipedia.org/wiki/"
+"Portable_Document_Format\">Wikipedia</link> zawiera więcej informacji."
 
 #. (itstool) path: td/p
 #: C/save.page:43
@@ -624,11 +679,19 @@ msgid ""
 "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. The size of the JPEG file is affected by the <link "
-"xref=\"quality\">image quality</link>. See the <link "
-"href=\"http://en.wikipedia.org/wiki/jpeg\">JPEG Wikipedia page</link> for "
-"more information."
-msgstr ""
+"the scanned images. The size of the JPEG file is affected by the <link xref="
+"\"quality\">image quality</link>. See the <link href=\"http://en.wikipedia."
+"org/wiki/jpeg\">JPEG Wikipedia page</link> for more information."
+msgstr ""
+"JPEG to format plików używany przez aparaty cyfrowane do zapisywania zdjęć. "
+"Plik JPEG jest względnie mały, bardzo łatwy w rozpowszechnianiu i odpowiedni "
+"do wysyłania na strony społecznościowe. Większość systemów operacyjnych "
+"domyślnie zawiera edytor plików JPEG. Jeśli zeskanowano wiele stron, to "
+"zostanie utworzony oddzielny plik JPEG dla każdej strony. Użyj tego typu "
+"pliku, jeśli zeskanowane obrazy mają być modyfikowane lub wysyłane. Rozmiar "
+"pliku JPEG zależy od <link xref=\"quality\">jakości obrazu</link>. <link "
+"href=\"https://pl.wikipedia.org/wiki/JPEG\">Wikipedia</link> zawiera więcej "
+"informacji."
 
 #. (itstool) path: td/p
 #: C/save.page:53
@@ -640,25 +703,35 @@ msgstr "PNG"
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Portable_Network_Graphics\">PNG Wikipedia page</link> for more "
+"information."
 msgstr ""
+"Pliki PNG zawierają surowe dane ze skanera. Powoduje to ich bardzo duży "
+"rozmiar i trudność w rozpowszechnianiu. Jeśli zeskanowano wiele stron, to "
+"zostanie utworzony oddzielny plik PNG dla każdej strony. <link href="
+"\"https://pl.wikipedia.org/wiki/Portable_Network_Graphics\">Wikipedia</link> "
+"zawiera więcej informacji."
 
 #. (itstool) path: td/p
 #: C/save.page:61
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #. (itstool) path: td/p
 #: C/save.page:62
 msgid ""
 "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 "
-"Wikipedia page</link> for more information."
+"file will be created for each page. See the <link href=\"http://en.wikipedia."
+"org/wiki/Tagged_Image_File_Format\">TIFF Wikipedia page</link> for more "
+"information."
 msgstr ""
+"Pliki TIFF zawierają surowe dane ze skanera. Powoduje to ich bardzo duży "
+"rozmiar i trudność w rozpowszechnianiu. Jeśli zeskanowano wiele stron, to "
+"zostanie utworzony oddzielny plik TIFF dla każdej strony. <link href="
+"\"https://pl.wikipedia.org/wiki/Tagged_Image_File_Format\">Wikipedia</link> "
+"zawiera więcej informacji."
 
 #. (itstool) path: page/title
 #: C/scanner.page:9
@@ -671,6 +744,8 @@ msgid ""
 "If you have multiple scanning devices you can change the selected device "
 "from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Jeśli do komputera podłączono kilka skanerów, to można zmienić używane "
+"urządzenie w menu <guiseq><gui>Dokument</gui><gui>Preferencje</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/scanner.page:15
@@ -680,6 +755,10 @@ msgid ""
 "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."
 msgstr ""
+"Lokalne skanery są automatycznie wykrywane podczas każdego uruchomienia "
+"programu <app>Proste skanowanie</app> i za każdym razem, gdy podłączany jest "
+"skaner przez USB. Jeśli połączono ze skanerem przez sieć w czasie działania "
+"programu, to należy go ponownie uruchomić, aby wykryć skaner."
 
 #. (itstool) path: info/title
 #: C/scanning.page:6
@@ -695,17 +774,17 @@ msgstr "Skanowanie strony"
 #. (itstool) path: page/p
 #: C/scanning.page:12
 msgid "To scan a document from your scanner:"
-msgstr "Aby zeskanować dokument swoim skanerem:"
+msgstr "Aby zeskanować dokument za pomocą skanera:"
 
 #. (itstool) path: item/p
 #: C/scanning.page:16
 msgid "Connect the scanner to your computer and power it on."
-msgstr ""
+msgstr "Podłącz skaner do komputera i go włącz."
 
 #. (itstool) path: item/p
 #: C/scanning.page:17
 msgid "Open <app>Simple Scan</app>."
-msgstr "Otwórz <app>Proste skanowanie</app>."
+msgstr "Otwórz program <app>Proste skanowanie</app>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:18
@@ -713,13 +792,17 @@ msgid ""
 "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>."
 msgstr ""
+"Kliknij strzałkę po prawej stronie przycisku „Skanuj” i wybierz typ "
+"skanowanego dokumentu: <em>Zdjęcie</em> lub <em>Tekst</em>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:21
 msgid ""
-"Click the \"Scan\" button on the toolbar (or press "
-"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
+"Click the \"Scan\" button on the toolbar (or press <keyseq><key>Ctrl</"
+"key><key>1</key></keyseq>)."
 msgstr ""
+"Kliknij przycisk „Skanuj” na pasku narzędziowym (lub naciśnij klawisze "
+"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
 
 #. (itstool) path: note/p
 #: C/scanning.page:24
@@ -728,13 +811,21 @@ msgid ""
 "the <key>Esc</key> key on the keyboard. Each page you scan is placed at the "
 "end of the document."
 msgstr ""
+"Strona będzie wyświetlana w trakcie skanowania. Aby zatrzymać skanowanie, "
+"naciśnij klawisz <key>Esc</key> w dowolnej chwili. Każda zeskanowana strona "
+"jest umieszczana na końcu dokumentu."
 
 #. (itstool) path: page/p
 #: C/scanning.page:29
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr ""
+"Typ dokumentu można także zmienić w menu <guiseq><gui>Dokument</gui> "
+"<gui>Skanowanie</gui></guiseq>. Wybierz <gui><em>Tekst</em></gui>, jeśli "
+"czarno-biały dokument ma zostać szybko zeskanowany, a <gui><em>Zdjęcie</em></"
+"gui>, jeśli kolorowy dokument ma mieć wysoką rozdzielczość. <link xref=\"dpi"
+"\"/> zawiera więcej informacji."
diff --git a/help/pl/pl.stamp b/help/pl/pl.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/pl/pl.stamp
+++ /dev/null
diff --git a/help/pl/print.page b/help/pl/print.page
deleted file mode 100644
index dc39067..0000000
--- a/help/pl/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Drukowanie</title>
-
-    <p>
-    <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/pl/quality.page b/help/pl/quality.page
deleted file mode 100644
index 324a3b7..0000000
--- a/help/pl/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/pl/reorder.page b/help/pl/reorder.page
deleted file mode 100644
index 3da9e63..0000000
--- a/help/pl/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Zmiana kolejności stron</title>
-
-    <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>
-    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/pl/rotate.page b/help/pl/rotate.page
deleted file mode 100644
index e96a127..0000000
--- a/help/pl/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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>Użyj 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/pl/save.page b/help/pl/save.page
deleted file mode 100644
index 4deed8b..0000000
--- a/help/pl/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Zapisywanie do pliku</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/pl/scanner.page b/help/pl/scanner.page
deleted file mode 100644
index e1b7f04..0000000
--- a/help/pl/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="pl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Wybór skanera</title>
-
-    <p>
-    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 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/pl/scanning.page b/help/pl/scanning.page
deleted file mode 100644
index 12d9cc9..0000000
--- a/help/pl/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="pl">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Skanowanie strony</title>
-
-    <p>Aby zeskanować dokument swoim skanerem:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Otwórz <app>Proste skanowanie</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>
-
-    <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>
-      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/pt_BR/adf.page b/help/pt_BR/adf.page
deleted file mode 100644
index cf2f4f5..0000000
--- a/help/pt_BR/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Usando um alimentador automático de documentos</title>
-
-    <p>
-    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 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/pt_BR/brightness-contrast.page b/help/pt_BR/brightness-contrast.page
deleted file mode 100644
index 8099ee5..0000000
--- a/help/pt_BR/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/pt_BR/crop.page b/help/pt_BR/crop.page
deleted file mode 100644
index dd6182e..0000000
--- a/help/pt_BR/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Recortando</title>
-
-    <p>
-    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/pt_BR/dpi.page b/help/pt_BR/dpi.page
deleted file mode 100644
index 70d5d50..0000000
--- a/help/pt_BR/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Configurando a resolução do digitalizador.</title>
-
-    <p>
-    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/pt_BR/email.page b/help/pt_BR/email.page
deleted file mode 100644
index da06bcb..0000000
--- a/help/pt_BR/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Enviando por e-mail</title>
-
-    <p>Para enviar o documento atual por e-mail, utilize o menu <guiseq><gui>Documento</gui><gui>E-mail</gui></guiseq> (<keyseq><key>Ctrl</key><key>E</key></keyseq>). O seu programa de e-mail será aberto com uma nova mensagem contendo o documento digitalizado como anexo.</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>Consulte <link xref="save"/> para mais informações sobre formatos de arquivos.</p>
-</page>
diff --git a/help/pt_BR/index.page b/help/pt_BR/index.page
deleted file mode 100644
index 57a673c..0000000
--- a/help/pt_BR/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="pt-BR">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Digitalizando páginas</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modificando o documento</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Usando o documento</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/pt_BR/legal.xml b/help/pt_BR/legal.xml
deleted file mode 100644
index fb8583a..0000000
--- a/help/pt_BR/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Esta obra está sob a licença <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>Como exceção especial, os detentores dos direitos autorais lhe dão permissão para copiar, modificar e distribuir o código exemplo contido neste documento sob os termos de sua escolha, sem restrições.</p>
-</license>
diff --git a/help/pt_BR/print.page b/help/pt_BR/print.page
deleted file mode 100644
index 53abb8c..0000000
--- a/help/pt_BR/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Impressão</title>
-
-    <p>
-    <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/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
index 17b5fc7..f1503b0 100644
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -1,76 +1,35 @@
 # Brazilian Portuguese translation for simple-scan
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright (c) 2017 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
+# Rafael Fontenelle <rafaelff@gnome.org>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2013-04-16 13:22+0000\n"
-"Last-Translator: Neliton Pereira Jr. <nelitonpjr@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-scan&component=general\n"
+"POT-Creation-Date: 2017-09-10 03:29+0000\n"
+"PO-Revision-Date: 2017-05-04 03:44-0200\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Project-Style: gnome\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
+"GNOME Contributions:\n"
+"  Rafael Fontenelle <rafaelff@gnome.org>, 2017\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n"
 "  millemiglia https://launchpad.net/~dnieper650"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Digitalizando páginas"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Modificando o documento"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Usando o documento"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -78,70 +37,58 @@ msgstr "Usando um alimentador automático de documentos"
 
 #. (itstool) path: page/p
 #: C/adf.page:11
-msgid ""
-"If your scanner features an Automatic Document Feeder (ADF) you can scan all "
-"the pages from the feeder via one of following methods:"
-msgstr ""
+msgid "If your scanner features an Automatic Document Feeder (ADF) you can scan all the pages from the feeder via one of following methods:"
+msgstr "Se seu scanner possui suporte a um alimentador automático de documentos (em inglês, Automatic Document Feeder – ADF) você pode digitalizar todas as páginas do alimentador por meio de um dos seguintes métodos:"
 
 #. (itstool) path: steps/title
-#: C/adf.page:17
+#: C/adf.page:16
 msgid "Use a Keyboard Shortcut"
-msgstr ""
+msgstr "Usando um atalho de teclado"
 
 #. (itstool) path: item/p
-#: C/adf.page:19
+#: C/adf.page:18
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr ""
+msgstr "Pressione <keyseq><key>Ctrl</key><key>F</key></keyseq>"
 
 #. (itstool) path: steps/title
-#: C/adf.page:24
-#: C/crop.page:27
-#: C/rotate.page:28
+#: C/adf.page:23 C/crop.page:27 C/rotate.page:28
 msgid "Use a Menu"
-msgstr ""
+msgstr "Usando um menu"
 
 #. (itstool) path: item/p
-#: C/adf.page:26
-msgid ""
-"Navigate to <guiseq><gui>Document</gui> <gui>Scan</gui><gui>All Pages From "
-"Feeder</gui></guiseq>."
-msgstr ""
+#: C/adf.page:25
+msgid "Navigate to <guiseq><gui>Document</gui> <gui>Scan</gui><gui>All Pages From Feeder</gui></guiseq>."
+msgstr "Navegue para <guiseq><gui>Documento</gui> <gui>Digitalizar</gui><gui>Todas as páginas do alimentador</gui></guiseq>."
 
 #. (itstool) path: steps/title
-#: C/adf.page:33
+#: C/adf.page:32
 msgid "Use the Toolbar Buttons"
-msgstr ""
+msgstr "Usando os botões da barra de ferramentas"
 
 #. (itstool) path: item/p
-#: C/adf.page:35
+#: C/adf.page:34
 msgid "Click on the arrow to the right of the \"Scan\" button."
-msgstr ""
+msgstr "Clique na seta para a direita do botão “Digitalizar”."
 
 #. (itstool) path: item/p
-#: C/adf.page:38
+#: C/adf.page:37
 msgid "Choose \"All Pages From Feeder\"."
-msgstr ""
+msgstr "Escolha “Todas as páginas do alimentador”."
 
 #. (itstool) path: item/media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:39
-#: C/scanning.page:20
+#: C/adf.page:38 C/scanning.page:20
 msgctxt "_"
-msgid ""
-"external ref='figures/scan_toolbar.png' "
-"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
-msgstr ""
+msgid "external ref='figures/scan_toolbar.png' md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+msgstr "external ref='figures/scan_toolbar.png' md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 
 #. (itstool) path: note/p
-#: C/adf.page:45
-msgid ""
-"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."
-msgstr ""
+#: C/adf.page:44
+msgid "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."
+msgstr "Por padrão, ambos lados de uma folha serão digitalizadas se seu scanner possui esta capacidade. Você pode escolher digitalização de apenas um lado a partir do menu <guiseq><gui>Documento</gui><gui>Preferências</gui></guiseq>."
 
 #. (itstool) path: note/media
 #. (itstool) path: page/media
@@ -149,27 +96,20 @@ msgstr ""
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/adf.page:49
-#: C/dpi.page:16
-#: C/scanner.page:14
+#: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
 msgctxt "_"
-msgid ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
-msgstr ""
+msgid "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+msgstr "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
 msgid "Setting brightness and Contrast"
-msgstr ""
+msgstr "Configurando brilho e contraste"
 
 #. (itstool) path: page/p
 #: C/brightness-contrast.page:11
-msgid ""
-"Some scanners allow the user to adjust the brightness and contrast when "
-"scanning. If your scans come out too dark or too light you can adjust these "
-"settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> "
-"menu."
-msgstr ""
+msgid "Some scanners allow the user to adjust the brightness and contrast when scanning. If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
+msgstr "Alguns scanners permitem o usuário ajustar o brilho e contraste ao digitalizar. Se suas digitalizações ficam escuras demais ou claras demais você pode ajustar essas configurações pelo menu <guiseq><gui>Documento</gui><gui>Preferências</gui></guiseq>."
 
 #. (itstool) path: page/title
 #: C/crop.page:9
@@ -178,160 +118,133 @@ msgstr "Recortando"
 
 #. (itstool) path: page/p
 #: C/crop.page:11
-msgid ""
-"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:"
-msgstr ""
+msgid "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:"
+msgstr "O recurso de recortar no <app>Digitalização simples</app> permite que você possa usar apenas uma parte de uma imagem digitalizada. Você pode habilitar recorte antes ou depois de digitalizar uma página, e você sempre pode alterar as dimensões do quadro de recorte. Quando recorte está habilitado, uma máscara aparecerá sobre a página atual com a área não será usada mostrada em cinza. Você pode habilitar recortar e escolher as dimensões desejadas via um dos seguintes métodos:"
 
 #. (itstool) path: steps/title
 #: C/crop.page:19
 msgid "Use a Right Click"
-msgstr ""
+msgstr "Use um clique do botão direito"
 
 #. (itstool) path: item/p
 #: C/crop.page:20
 msgid "Right click anywhere on the image area and select \"Crop\"."
-msgstr ""
+msgstr "Clique com botão direito do mouse em qualquer lugar na área da imagem e selecione “Recortar”."
 
 #. (itstool) path: item/p
 #: C/crop.page:21
-msgid ""
-"Choose one of the fixed crop frames, or select \"Custom\" to manually set "
-"the crop frame's dimensions by dragging its borders."
-msgstr ""
+msgid "Choose one of the fixed crop frames, or select \"Custom\" to manually set the crop frame's dimensions by dragging its borders."
+msgstr "Escolha um dos quadros de recortes fixos, ou selecione “Personalizar” para definir manualmente as dimensões do quadro de corte arrastando suas bordas."
 
 #. (itstool) path: item/p
-#: C/crop.page:23
-#: C/crop.page:30
+#: C/crop.page:23 C/crop.page:30
 msgid "Click and hold the frame, then move it to the desired position."
-msgstr ""
+msgstr "Clique e segure o quadro, então movê-lo para a posição desejada."
 
 #. (itstool) path: item/p
 #: C/crop.page:28
 msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
-msgstr ""
+msgstr "Navegue para o menu <guiseq><gui>Página</gui><gui>Recortar</gui></guiseq>."
 
 #. (itstool) path: item/p
 #: C/crop.page:29
-msgid ""
-"Choose one of the fixed crop frames, or select \"Custom\" to manually adjust "
-"the frame's dimensions by dragging its borders."
-msgstr ""
+msgid "Choose one of the fixed crop frames, or select \"Custom\" to manually adjust the frame's dimensions by dragging its borders."
+msgstr "Escolha um dos quadros de recortes fixos, ou selecione “Personalizar” para ajustas manualmente as dimensões do quadro arrastando suas bordas."
 
 #. (itstool) path: steps/title
 #: C/crop.page:34
 msgid "Use the Toolbar"
-msgstr ""
+msgstr "Usando a barra de ferramentas"
 
 #. (itstool) path: item/p
 #: C/crop.page:35
 msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
-msgstr ""
+msgstr "Clique no botão “<gui>Recortar</gui>” na barra de ferramentas."
 
 #. (itstool) path: note/p
 #: C/crop.page:36
-msgid ""
-"This is the same as choosing \"Custom\" in step 2 of the aforementioned "
-"methods."
-msgstr ""
+msgid "This is the same as choosing \"Custom\" in step 2 of the aforementioned methods."
+msgstr "Esse é o mesmo que escolher “Personalizar” na etapa 2 dos métodos supramencionados."
 
 #. (itstool) path: item/p
 #: C/crop.page:38
-msgid ""
-"Drag the borders of the frame to set the desired dimensions and position."
-msgstr ""
+msgid "Drag the borders of the frame to set the desired dimensions and position."
+msgstr "Arraste as bordas do quadro para definir as dimensões e posição desejadas."
 
 #. (itstool) path: note/p
 #: C/crop.page:42
 msgid "Each new scanned page will use the previous crop."
-msgstr ""
+msgstr "Cada nova página digitalizada usará o recorte anterior."
 
 #. (itstool) path: page/title
 #: C/dpi.page:9
 msgid "Setting the Scan Resolution"
-msgstr "Configurando a resolução do digitalizador."
+msgstr "Configurando a resolução de digitalização"
 
 #. (itstool) path: page/p
 #: C/dpi.page:11
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "A resolução padrão para documento de tipo <gui><em>Texto</em></gui> é 150 dpi (dots per inch, que pode ser traduzido como “pontos por polegadas”) e para documentos de tipo <gui><em>Foto</em></gui> é 300 dpi. Você pode alterar essas configurações a partir do menu <guiseq><gui>Documento</gui><gui>Preferências</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/dpi.page:18
-msgid ""
-"The available scanning resolutions for both document types (Text and Photo) "
-"are the same and are listed in the following table:"
-msgstr ""
+msgid "The available scanning resolutions for both document types (Text and Photo) are the same and are listed in the following table:"
+msgstr "As resoluções de digitalização disponíveis para ambos tipos de documento (Texto e Foto) são o mesmo e são listados na tabela a seguir:"
 
 #. (itstool) path: td/p
 #: C/dpi.page:23
 msgid "<em>Text Resolution</em>"
-msgstr ""
+msgstr "<em>Resolução do texto</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:24
 msgid "<em>Photo Resolution</em>"
-msgstr ""
+msgstr "<em>Resolução do foto</em>"
 
 #. (itstool) path: td/p
-#: C/dpi.page:27
-#: C/dpi.page:28
+#: C/dpi.page:27 C/dpi.page:28
 msgid "75 dpi (draft)"
-msgstr ""
+msgstr "75 dpi (rascunho)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:31
 msgid "150 dpi (default)"
-msgstr ""
+msgstr "150 dpi (padrão)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:32
 msgid "150 dpi"
-msgstr ""
+msgstr "150 dpi"
 
 #. (itstool) path: td/p
 #: C/dpi.page:35
 msgid "300 dpi"
-msgstr ""
+msgstr "300 dpi"
 
 #. (itstool) path: td/p
 #: C/dpi.page:36
 msgid "300 dpi (default)"
-msgstr ""
+msgstr "300 dpi (padrão)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:39
-#: C/dpi.page:40
+#: C/dpi.page:39 C/dpi.page:40
 msgid "600 dpi"
-msgstr ""
+msgstr "600 dpi"
 
 #. (itstool) path: td/p
-#: C/dpi.page:43
-#: C/dpi.page:44
+#: C/dpi.page:43 C/dpi.page:44
 msgid "1200 dpi (high resolution)"
-msgstr ""
+msgstr "1200 dpi (alta resolução)"
 
 #. (itstool) path: td/p
-#: C/dpi.page:47
-#: C/dpi.page:48
+#: C/dpi.page:47 C/dpi.page:48
 msgid "2400 dpi"
-msgstr ""
+msgstr "2400 dpi"
 
 #. (itstool) path: note/p
 #: C/dpi.page:52
-msgid ""
-"<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!"
-msgstr ""
+msgid "<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!"
+msgstr "Documentos <gui><em>Texto</em></gui> são sempre digitalizados em preto em branco, enquanto documentos <gui><em>Foto</em></gui> são sempre digitalizados em cores, em qualquer resolução!"
 
 #. (itstool) path: page/title
 #: C/email.page:9
@@ -340,37 +253,63 @@ msgstr "Enviando por e-mail"
 
 #. (itstool) path: page/p
 #: C/email.page:11
-msgid ""
-"To email the current document use the "
-"<guiseq><gui>Document</gui><gui>Email</gui></guiseq> menu "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be "
-"opened with a new message containing the scanned document as an attachment."
-msgstr ""
-"Para enviar o documento atual por e-mail, utilize o menu "
-"<guiseq><gui>Documento</gui><gui>E-mail</gui></guiseq> "
-"(<keyseq><key>Ctrl</key><key>E</key></keyseq>). O seu programa de e-mail "
-"será aberto com uma nova mensagem contendo o documento digitalizado como "
-"anexo."
+msgid "To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with a new message containing the scanned document as an attachment."
+msgstr "Para enviar o documento atual por e-mail, utilize o menu <guiseq><gui>Documento</gui><gui>E-mail</gui></guiseq> (<keyseq><key>Ctrl</key><key>E</key></keyseq>). O seu programa de e-mail será aberto com uma nova mensagem contendo o documento digitalizado como anexo."
 
 #. (itstool) path: page/p
 #: C/email.page:16
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Se o tipo de documento foi definido para “Texto” o e-mail terá um anexo em PDF para cada página. Por sua vez, se o tipo do documento foi definido para “Foto”, o e-mail terá um anexo JPEG para cada página."
 
 #. (itstool) path: page/p
 #: C/email.page:21
 msgid "See <link xref=\"save\"/> for more information about file formats."
-msgstr ""
-"Consulte <link xref=\"save\"/> para mais informações sobre formatos de "
-"arquivos."
+msgstr "Consulte <link xref=\"save\"/> para mais informações sobre formatos de arquivos."
+
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr "<media type=\"image\" src=\"figures/icon.png\"/> Manual do Digitalização simples"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Digitalizando páginas"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Modificando o documento"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Usando o documento"
 
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
-msgstr "Creative Commons Attribution-Share Alike 3.0 Unported License"
+msgstr "Creative Commons Atribuição-CompartilhaIgual 3.0 Não Adaptada"
 
 #. (itstool) path: license/p
 #: C/legal.xml:3
@@ -379,14 +318,8 @@ msgstr "Esta obra está sob a licença <_:link-1/>."
 
 #. (itstool) path: license/p
 #: C/legal.xml:6
-msgid ""
-"As a special exception, the copyright holders give you permission to copy, "
-"modify, and distribute the example code contained in this document under the "
-"terms of your choosing, without restriction."
-msgstr ""
-"Como exceção especial, os detentores dos direitos autorais lhe dão permissão "
-"para copiar, modificar e distribuir o código exemplo contido neste documento "
-"sob os termos de sua escolha, sem restrições."
+msgid "As a special exception, the copyright holders give you permission to copy, modify, and distribute the example code contained in this document under the terms of your choosing, without restriction."
+msgstr "Como exceção especial, os detentores dos direitos autorais lhe dão permissão para copiar, modificar e distribuir o código exemplo contido neste documento sob os termos de sua escolha, sem restrições."
 
 #. (itstool) path: page/title
 #: C/print.page:9
@@ -395,50 +328,33 @@ msgstr "Impressão"
 
 #. (itstool) path: page/p
 #: C/print.page:11
-msgid ""
-"<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."
-msgstr ""
+msgid "<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."
+msgstr "<app>Digitalização simples</app> permite que você imprima um documento digitalizado diretamente por sua interface, sem ter que salvar o documento primeiro. Esse recurso torna o <app>Digitalização simples</app> uma ferramenta muito conveniente para fazer cópias de documentos ou fotos."
 
 #. (itstool) path: steps/title
 #: C/print.page:17
 msgid "To Print a Document"
-msgstr ""
+msgstr "Para imprimir um documento"
 
 #. (itstool) path: item/p
 #: C/print.page:19
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Vá para o menu <guiseq><gui>Documento</gui><gui>Imprimir</gui></guiseq> ou use o atalho de teclado <keyseq><key>Ctrl</key><key>P</key></keyseq>. Isso vai abrir a caixa de diálogo “Imprimir”."
 
 #. (itstool) path: item/p
 #: C/print.page:25
-msgid ""
-"From the \"Print\" dialog box choose your desired printing settings and/or "
-"Print Preview the document, then press the \"Print\" button."
-msgstr ""
+msgid "From the \"Print\" dialog box choose your desired printing settings and/or Print Preview the document, then press the \"Print\" button."
+msgstr "A partir da caixa de diálogo “Imprimir” escolha suas configurações de impressão desejadas e/ou pré-visualize a impressão o documento, então pressione o botão “Imprimir”."
 
 #. (itstool) path: page/title
 #: C/quality.page:9
 msgid "Setting the Image Quality"
-msgstr ""
+msgstr "Configurando a qualidade da imagem"
 
 #. (itstool) path: page/p
 #: C/quality.page:11
-msgid ""
-"You can adjust the image quality that is used when the scan is converted to "
-"a file by changing this setting in the "
-"<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu. Using a low "
-"quality will result in a small file size but may show some blurring or "
-"blockiness in the image. A high quality will keep all the scanned "
-"information but require a larger file size. See the <link "
-"href=\"https://en.wikipedia.org/wiki/Lossy_compression\">Lossy compression "
-"Wikipedia page</link> for more information."
-msgstr ""
+msgid "You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the save dialog. Using a low quality will result in a small file size but may show some blurring or blockiness in the image. A high quality will keep all the scanned information but require a larger file size. See the <link href=\"https://en.wikipedia.org/wiki/Lossy_compression\">Lossy compression Wikipedia page</link> for more information."
+msgstr "Você pode ajustar a qualidade da imagem que é usada quando o scanner é convertido em um arquivo alterando essa configuração no diálogo de salvamento. Usar uma baixa qualidade resultará em um arquivo de tamanho pequeno, mas pode mostrar alguma desfocagem e blocagem na imagem. Uma qualidade alta manterá todas as informações digitalizadas, mas exigiria um tamanho maior de arquivo. Veja a <link href=\"https://en.wikipedia.org/wiki/Lossy_compression\">página do Wikipédia sobre compressão Lossy</link> para mais informações."
 
 #. (itstool) path: page/title
 #: C/reorder.page:9
@@ -447,171 +363,148 @@ msgstr "Reordenando páginas"
 
 #. (itstool) path: page/p
 #: C/reorder.page:11
-msgid ""
-"To move a page, right click on it and choose <gui><em>Move Left</em></gui> "
-"or <gui><em>Move Right</em></gui>."
-msgstr ""
+msgid "To move a page, right click on it and choose <gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui>."
+msgstr "Para mover uma página, clique com botão direito nela e escolha <gui><em>Mover para a esquerda</em></gui> ou <gui><em>Mover para a direita</em></gui>."
 
 #. (itstool) path: page/p
 #: C/reorder.page:16
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Alternativamente, você pode mover uma página pela primeira selecionando-a e então escolhendo <gui><em>Mover para a esquerda</em></gui> ou <gui><em>Mover para a direita</em></gui> do menu “Página”."
 
 #. (itstool) path: page/title
 #: C/rotate.page:9
 msgid "Rotating a Page"
-msgstr ""
+msgstr "Girando uma página"
 
 #. (itstool) path: page/p
 #: C/rotate.page:11
-msgid ""
-"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:"
-msgstr ""
+msgid "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:"
+msgstr "No <app>Digitalização simples</app>, você pode alterar a rotação de uma página antes ou depois de digitalizar a página. Atualmente, há quatro formas de girar uma página:"
 
 #. (itstool) path: steps/title
 #: C/rotate.page:17
 msgid "Use Toolbar Buttons"
-msgstr ""
+msgstr "Usando a barra de ferramentas"
 
 #. (itstool) path: item/p
-#: C/rotate.page:18
-#: C/rotate.page:29
-#: C/rotate.page:35
+#: C/rotate.page:18 C/rotate.page:29 C/rotate.page:35
 msgid "Select the page you want to rotate by clicking on it once."
-msgstr ""
+msgstr "Selecione a página que você deseja girar clicando nela uma vez."
 
 #. (itstool) path: item/p
 #: C/rotate.page:19
-msgid ""
-"Press one of the arrows on the toolbar to rotate the page in the desired "
-"direction."
-msgstr ""
+msgid "Press one of the arrows on the toolbar to rotate the page in the desired direction."
+msgstr "Pressione uma das setas na barra de ferramentas para girar a página na direção desejada."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:22
 msgid "Use Right Click"
-msgstr ""
+msgstr "Usando o clique do botão direito"
 
 #. (itstool) path: item/p
 #: C/rotate.page:23
 msgid "Right click on the page you want to rotate."
-msgstr ""
+msgstr "Clique com o botão direito da página que você deseja girar."
 
 #. (itstool) path: item/p
 #: C/rotate.page:24
 msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
-msgstr ""
+msgstr "A partir do menu de contexto, escolha “Girar à esquerda” ou “Girar à direita”."
 
 #. (itstool) path: item/p
 #: C/rotate.page:30
-msgid ""
-"Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
-msgstr ""
+msgid "Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
+msgstr "Clique no menu “Página” e selecione “Girar à esquerda” ou “Girar à direita”."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:34
 msgid "Use Shortcuts"
-msgstr ""
+msgstr "Usando atalhos"
 
 #. (itstool) path: item/p
 #: C/rotate.page:36
 msgid "Press one of the following shortcut keys:"
-msgstr ""
+msgstr "Pressione uma das seguintes teclas de atalho:"
 
 #. (itstool) path: td/p
 #: C/rotate.page:39
 msgid "<em>Command</em>"
-msgstr ""
+msgstr "<em>Comando</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:40
 msgid "<em>Shortcut Key</em>"
-msgstr ""
+msgstr "<em>Tecla de atalho</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:43
 msgid "Rotate Left"
-msgstr ""
+msgstr "Girar à esquerda"
 
 #. (itstool) path: td/p
 #: C/rotate.page:44
 msgid "<key>[</key> (left bracket)"
-msgstr ""
+msgstr "<key>[</key> (colchete esquerdo)"
 
 #. (itstool) path: td/p
 #: C/rotate.page:47
 msgid "Rotate Right"
-msgstr ""
+msgstr "Girar à direita"
 
 #. (itstool) path: td/p
 #: C/rotate.page:48
 msgid "<key>]</key> (right bracket)"
-msgstr ""
+msgstr "<key>]</key> (colchete direito)"
 
 #. (itstool) path: note/p
 #: C/rotate.page:54
 msgid "Each new scanned page will use the previous rotation."
-msgstr ""
+msgstr "Cada nova página digitalizada usará o rotação anterior."
 
 #. (itstool) path: page/title
 #: C/save.page:9
 msgid "Saving to a File"
-msgstr "Salvando em arquivo"
+msgstr "Salvando em um arquivo"
 
 #. (itstool) path: item/p
 #: C/save.page:13
-msgid ""
-"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>)."
-msgstr ""
+msgid "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>)."
+msgstr "Navegue para o menu <guiseq><gui>Documento</gui><gui>Salvar como</gui></guiseq> (ou pressione <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>)."
 
 #. (itstool) path: item/p
 #: C/save.page:18
-msgid ""
-"From the \"Save As\" dialog box, choose one of the supported file types, or "
-"simply change the extension in the \"Name\" field."
-msgstr ""
+msgid "From the \"Save As\" dialog box, choose one of the supported file types, or simply change the extension in the \"Name\" field."
+msgstr "A partir da caixa de diálogo “Salvar como”, escolha um dos tipos de arquivo aceitos, ou simplesmente alter a extensão no campo “Nome”."
 
 #. (itstool) path: item/p
 #: C/save.page:23
 msgid "Press the \"Save\" button."
-msgstr ""
+msgstr "Pressione o botão “Salvar”."
 
 #. (itstool) path: table/title
 #: C/save.page:29
 msgid "Supported File Types"
-msgstr ""
+msgstr "Tipos de arquivos aceitos"
 
 #. (itstool) path: td/p
 #: C/save.page:31
 msgid "<em>Type</em>"
-msgstr ""
+msgstr "<em>Tipo</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:32
 msgid "<em>Brief Description</em>"
-msgstr ""
+msgstr "<em>Descrição breve</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:35
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #. (itstool) path: td/p
 #: C/save.page:36
-msgid ""
-"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. The size of the PDF document "
-"is affected by the <link xref=\"quality\">image quality</link>. See the "
-"<link href=\"http://en.wikipedia.org/wiki/pdf\">PDF Wikipedia page</link> "
-"for more information."
-msgstr ""
+msgid "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. The size of the PDF document is affected by the <link xref=\"quality\">image quality</link>. See the <link href=\"http://en.wikipedia.org/wiki/pdf\">PDF Wikipedia page</link> for more information."
+msgstr "Um PDF pode conter múltiplas páginas, como um livro, e é fácil de distribuir. Apenas um número pequeno de programas do Linux pode modificar documentos PDF, de forma que esse formato é recomendado principalmente para arquivamento. O tamanho do documento PDF é afetado pela <link xref=\"quality\">qualidade da imagem</link>. Veja a <link href=\"http://en.wikipedia.org/wiki/pdf\">página do Wikipédia sobre PDF</link> para mais informações."
 
 #. (itstool) path: td/p
 #: C/save.page:43
@@ -620,17 +513,8 @@ msgstr "JPEG"
 
 #. (itstool) path: td/p
 #: C/save.page:44
-msgid ""
-"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. The size of the JPEG file is affected by the <link "
-"xref=\"quality\">image quality</link>. See the <link "
-"href=\"http://en.wikipedia.org/wiki/jpeg\">JPEG Wikipedia page</link> for "
-"more information."
-msgstr ""
+msgid "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. The size of the JPEG file is affected by the <link xref=\"quality\">image quality</link>. See the <link href=\"http://en.wikipedia.org/wiki/jpeg\">JPEG Wikipedia page</link> for more information."
+msgstr "JPEG é o formato de arquivo usado por câmeras digitais para salvar imagens. Um arquivo JPEG é relativamente pequeno, muito fácil de distribuir e adequado para envio para sites de rede social. A maioria dos sistemas operacionais vem com um editor JPEG por padrão. Se você digitalizou múltiplas páginas, um arquivo JPEG será criado para cada página. Use esse tipo de arquivo se você deseja modificar ou atualizar as imagens digitalizadas. O tamanho do arquivo JPEG é afetado pela <link xref=\"quality\">qualidade da imagem</link>. Veja a <link href=\"http://en.wikipedia.org/wiki/jpeg\">página do Wikipédia sobre JPEG</link> para mais informações."
 
 #. (itstool) path: td/p
 #: C/save.page:53
@@ -639,49 +523,33 @@ msgstr "PNG"
 
 #. (itstool) path: td/p
 #: C/save.page:54
-msgid ""
-"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 "
-"Wikipedia page</link> for more information."
-msgstr ""
+msgid "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 Wikipedia page</link> for more information."
+msgstr "Arquivos PNG contêm os dados não tratados do scanner. Isso torna eles muito grande e não adequado para distribuição. Se você digitalizou múltiplas páginas, um arquivo PNG será criado para cada página. Veja a <link href=\"http://en.wikipedia.org/wiki/Portable_Network_Graphics\">página do Wikipédia sobre PNG</link> para mais informações."
 
 #. (itstool) path: td/p
 #: C/save.page:61
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #. (itstool) path: td/p
 #: C/save.page:62
-msgid ""
-"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 "
-"Wikipedia page</link> for more information."
-msgstr ""
+msgid "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 Wikipedia page</link> for more information."
+msgstr "Arquivos TIFF contêm os dados não tratados do scanner. Isso torna eles muito grande e não adequado para distribuição. Se você digitalizou múltiplas páginas, um arquivo TIFF será criado para cada página. Veja a <link href=\"http://en.wikipedia.org/wiki/Tagged_Image_File_Format\">página do Wikipédia sobre TIFF</link> para mais informações."
 
 #. (itstool) path: page/title
 #: C/scanner.page:9
 msgid "Selecting a Scanner"
-msgstr "Selecionando um digitalizador"
+msgstr "Selecionando um scanner"
 
 #. (itstool) path: page/p
 #: C/scanner.page:11
-msgid ""
-"If you have multiple scanning devices you can change the selected device "
-"from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-msgstr ""
+msgid "If you have multiple scanning devices you can change the selected device from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
+msgstr "Se você possui múltiplos dispositivos de digitalização, você pode alterar o dispositivo selecionado a partir do menu <guiseq><gui>Documento</gui><gui>Preferências</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/scanner.page:15
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "Seus scanners locais são detectados automaticamente cada vez que você iniciar o <app>Digitalização simples</app> e cada vez que você conectar um digitalizar USB. Se você conectar um scanner de rede enquanto <app>Digitalização simples</app> está em execução, você precisará reiniciar <app>Digitalização simples</app> para o scanner para ser detectado."
 
 #. (itstool) path: info/title
 #: C/scanning.page:6
@@ -697,46 +565,212 @@ msgstr "Digitalizando uma página"
 #. (itstool) path: page/p
 #: C/scanning.page:12
 msgid "To scan a document from your scanner:"
-msgstr "Para digitalizar um documento no seu digitalizador:"
+msgstr "Para digitalizar um documento no seu scanner:"
 
 #. (itstool) path: item/p
 #: C/scanning.page:16
 msgid "Connect the scanner to your computer and power it on."
-msgstr ""
+msgstr "Conecte o scanner a seu computador e ligue-o."
 
 #. (itstool) path: item/p
 #: C/scanning.page:17
 msgid "Open <app>Simple Scan</app>."
-msgstr "Abra o <app>Digitalizador simples</app>."
+msgstr "Abra o <app>Digitalização simples</app>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:18
-msgid ""
-"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>."
-msgstr ""
+msgid "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>."
+msgstr "Clique na seta para a direita do botão “Digitalizar” e escolha o tipo de documento que você está digitalizando: <em>Foto</em> ou <em>Texto</em>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:21
-msgid ""
-"Click the \"Scan\" button on the toolbar (or press "
-"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-msgstr ""
+msgid "Click the \"Scan\" button on the toolbar (or press <keyseq><key>Ctrl</key><key>1</key></keyseq>)."
+msgstr "Clique no botão “Digitalizar” na barra de ferramentas ( ou pressione <keyseq><key>Ctrl</key><key>1</key></keyseq>)."
 
 #. (itstool) path: note/p
 #: C/scanning.page:24
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "A página será mostrada na medida em que é digitalizada. Para parar a digitalização a qualquer momento, pressione a tecla <key>Esc</key> no teclado. Cada página que você digitaliza é colocada no final do documento."
 
 #. (itstool) path: page/p
 #: C/scanning.page:29
-msgid ""
-"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."
-msgstr ""
+msgid "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."
+msgstr "O tipo de documento também pode ser alterado a partir do menu <guiseq><gui>Documento</gui><gui>Digitalizar</gui></guiseq>. Escolha <gui><em>Texto</em></gui> se você deseja que o documento seja digitalizado rapidamente em preto e branco; escolha <gui><em>Foto</em></gui> para uma digitalização coloria de alta resolução. Veja <link xref=\"dpi\"/> para mais detalhes e mais opções."
+
+#~ msgid "Simple Scan Shortcuts"
+#~ msgstr "Atalhos do Digitalização simples"
+
+#~ msgid "Externally View a Page"
+#~ msgstr "Visualizando externamente uma página"
+
+#~ msgid "Double click a scanned page to view it with your default image viewer. This action creates a TIFF file containing the raw data from the scanner in your /tmp directory named \"<em>scanned-pageXXXXXX.tiff</em>\"."
+#~ msgstr "Clique duplo em uma página digitalizada para vê-la com seu visualizador de imagem padrão. Essa ação cria um arquivo TIFF contendo os dados não tratados do scanner em seu diretório /tmp chamado “<em>scanned-pageXXXXXX.tiff</em>”."
+
+#~ msgid "If you double click the scanned page after crop is enabled, only the cropped part will open. You can, therefore, use this feature to check more accurately whether you have positioned the crop frame exactly where you wanted it."
+#~ msgstr "Se você der um clique duplo na página digitalizada após recorte estar habilitado, apenas a parte recortada será aberta. Você pode, portanto, usar esse recurso para verificar com mais precisão se você posicionou o quadro recortado exatamente onde você queria."
+
+#~| msgid "Rotating a Page"
+#~ msgid "Deleting a Page"
+#~ msgstr "Excluindo uma página"
+
+#~| msgid "Right click on the page you want to rotate."
+#~ msgid "Right click on the page you want to delete."
+#~ msgstr "Clique com o botão direito da página que você deseja excluir."
+
+#~ msgid "Choose \"Delete\" from the context menu."
+#~ msgstr "Escolha “Excluir” a partir do menu de contexto."
+
+#~| msgid "Use Shortcuts"
+#~ msgid "Use a Shortcut Key"
+#~ msgstr "Usando uma atalho de teclado"
+
+#~| msgid "Select the page you want to rotate by clicking on it once."
+#~ msgid "Select the page you want to delete (by clicking on it once)."
+#~ msgstr "Selecione a página que você deseja excluir (clicando nela uma vez)."
+
+#~ msgid "Press the <key>Delete</key> key on the keyboard."
+#~ msgstr "Pressione a tecla <key>Delete</key> no teclado."
+
+#~ msgid "Go to the \"Page\" menu and click \"Delete\"."
+#~ msgstr "Vá para o menu “Página” e clique “Excluir”."
+
+#~ msgid "WARNING: The deletion of a page cannot be undone!"
+#~ msgstr "AVISO: A exclusão de uma página não pode ser desfeita!"
+
+#~| msgid "Use a Keyboard Shortcut"
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Atalhos de teclado"
+
+#~| msgid "Use Shortcuts"
+#~ msgid "Shortcut"
+#~ msgstr "Atalho"
+
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Alt</key><key>D</key></keyseq>"
+#~ msgstr "<keyseq><key>Alt</key><key>D</key></keyseq>"
+
+#~ msgid "Document menu"
+#~ msgstr "Menu de documento"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Alt</key><key>H</key></keyseq>"
+#~ msgstr "<keyseq><key>Alt</key><key>H</key></keyseq>"
+
+#~ msgid "Help menu"
+#~ msgstr "Menu de ajuda"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Alt</key><key>P</key></keyseq>"
+#~ msgstr "<keyseq><key>Alt</key><key>P</key></keyseq>"
+
+#~ msgid "Page menu"
+#~ msgstr "Menu de página"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Alt</key><key>F4</key></keyseq>"
+#~ msgstr "<keyseq><key>Alt</key><key>F4</key></keyseq>"
+
+#~| msgid "Open <app>Simple Scan</app>."
+#~ msgid "Close <app>Simple Scan</app>"
+#~ msgstr "Fecha o <app>Digitalização simples</app>"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Ctrl</key><key>1</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>1</key></keyseq>"
+
+#~| msgid "Scanning Pages"
+#~ msgid "Scan a single page"
+#~ msgstr "Digitaliza um página única"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
+
+#~| msgid "Using the Document"
+#~ msgid "Email the document"
+#~ msgstr "Envia o documento por e-mail"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+
+#~| msgid "To Print a Document"
+#~ msgid "Start a new document"
+#~ msgstr "Inicia um novo documento"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Ctrl</key><key>P</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>P</key></keyseq>"
+
+#~ msgid "Open the Print dialog box"
+#~ msgstr "Abre uma caixa de diálogo de impressão"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+
+#~| msgid "Open <app>Simple Scan</app>."
+#~ msgid "Quit <app>Simple Scan</app>"
+#~ msgstr "Sai do <app>Digitalização simples</app>."
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+
+#~ msgid "Save"
+#~ msgstr "Salva"
+
+#~| msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+#~ msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>"
+
+#~ msgid "Save As"
+#~ msgstr "Salva como"
+
+#~ msgid "<key>Delete</key>"
+#~ msgstr "<key>Delete</key>"
+
+#~ msgid "Delete selected page"
+#~ msgstr "Excluir a página selecionada"
+
+#~| msgid "<em>Command</em>"
+#~ msgid "<key>End</key>"
+#~ msgstr "<key>End</key>"
+
+#~ msgid "Select the last page of the document"
+#~ msgstr "Seleciona a última página do documento"
+
+#~ msgid "<key>Esc</key>"
+#~ msgstr "<key>Esc</key>"
+
+#~ msgid "Stop the current scan"
+#~ msgstr "Interrompe a digitalização atual"
+
+#~ msgid "<key>F1</key>"
+#~ msgstr "<key>F1</key>"
+
+#~ msgid "Help"
+#~ msgstr "Ajuda"
+
+#~ msgid "<key>F10</key>"
+#~ msgstr "<key>F10</key>"
+
+#~ msgid "Document Menu (open/close)"
+#~ msgstr "Menu do documento (abre/fecha)"
+
+#~ msgid "<key>Home</key>"
+#~ msgstr "<key>Home</key>"
+
+#~ msgid "Select the first page of the document"
+#~ msgstr "Seleciona a primeira página do documento"
+
+#~| msgid "<key>[</key> (left bracket)"
+#~ msgid "<key>[</key>"
+#~ msgstr "<key>[</key>"
+
+#~| msgid "<key>]</key> (right bracket)"
+#~ msgid "<key>]</key>"
+#~ msgstr "<key>]</key>"
diff --git a/help/pt_BR/pt_BR.stamp b/help/pt_BR/pt_BR.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/pt_BR/pt_BR.stamp
+++ /dev/null
diff --git a/help/pt_BR/quality.page b/help/pt_BR/quality.page
deleted file mode 100644
index 935fb14..0000000
--- a/help/pt_BR/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/pt_BR/reorder.page b/help/pt_BR/reorder.page
deleted file mode 100644
index f307913..0000000
--- a/help/pt_BR/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordenando páginas</title>
-
-    <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>
-    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/pt_BR/rotate.page b/help/pt_BR/rotate.page
deleted file mode 100644
index 1a96e91..0000000
--- a/help/pt_BR/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/pt_BR/save.page b/help/pt_BR/save.page
deleted file mode 100644
index 6f474ed..0000000
--- a/help/pt_BR/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Salvando em arquivo</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/pt_BR/scanner.page b/help/pt_BR/scanner.page
deleted file mode 100644
index c196380..0000000
--- a/help/pt_BR/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecionando um digitalizador</title>
-
-    <p>
-    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 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/pt_BR/scanning.page b/help/pt_BR/scanning.page
deleted file mode 100644
index 8e5d048..0000000
--- a/help/pt_BR/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="pt-BR">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Digitalizando uma página</title>
-
-    <p>Para digitalizar um documento no seu digitalizador:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Abra o <app>Digitalizador simples</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>
-
-    <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>
-      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/ru/adf.page b/help/ru/adf.page
deleted file mode 100644
index 61134c2..0000000
--- a/help/ru/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Использование автоподатчика страниц</title>
-
-    <p>
-    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 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/ru/brightness-contrast.page b/help/ru/brightness-contrast.page
deleted file mode 100644
index d680a50..0000000
--- a/help/ru/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/ru/crop.page b/help/ru/crop.page
deleted file mode 100644
index 46947a5..0000000
--- a/help/ru/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Обрезка</title>
-
-    <p>
-    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/ru/dpi.page b/help/ru/dpi.page
deleted file mode 100644
index 9a4ef31..0000000
--- a/help/ru/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Выбор разрешения сканирования</title>
-
-    <p>
-    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/ru/email.page b/help/ru/email.page
deleted file mode 100644
index dba30c1..0000000
--- a/help/ru/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Отправка по электронной почте</title>
-
-    <p>Для отправки текущего документа используйте меню <guiseq><gui>Документ</gui><gui>Отправить по электронной почте</gui></guiseq> (<keyseq><key>Ctrl</key><key>E</key></keyseq>). В вашей почтовой программе будет создано новое сообщение, содержащее отсканированный документ в виде вложения.</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>Смотрите <link xref="save"/> для дополнительных сведений о форматах файлов.</p>
-</page>
diff --git a/help/ru/index.page b/help/ru/index.page
deleted file mode 100644
index a52c789..0000000
--- a/help/ru/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="ru">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Сканирование страниц</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Изменение документа</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Использование документа</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/ru/legal.xml b/help/ru/legal.xml
deleted file mode 100644
index 876201b..0000000
--- a/help/ru/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Это руководство распространяется на условиях <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>В качестве особого исключения, владельцы авторских прав разрешают вам копировать, изменять и распространять код примеров, содержащихся в этом документе, на выбранных вами условиях, без ограничений.</p>
-</license>
diff --git a/help/ru/print.page b/help/ru/print.page
deleted file mode 100644
index c9b09f2..0000000
--- a/help/ru/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Печать</title>
-
-    <p>
-    <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/ru/quality.page b/help/ru/quality.page
deleted file mode 100644
index 3ca326a..0000000
--- a/help/ru/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/ru/reorder.page b/help/ru/reorder.page
deleted file mode 100644
index 4c16aa9..0000000
--- a/help/ru/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Изменение порядка страниц</title>
-
-    <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>
-    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/ru/rotate.page b/help/ru/rotate.page
deleted file mode 100644
index 6664c77..0000000
--- a/help/ru/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/ru/ru.po b/help/ru/ru.po
index 0336628..6412337 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2015-07-23 23:34+0000\n"
 "Last-Translator: ned <Unknown>\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: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Aleksey Kabanov https://launchpad.net/~ak099"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Сканирование страниц"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Изменение документа"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Использование документа"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -365,6 +319,52 @@ msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 "Смотрите <link xref=\"save\"/> для дополнительных сведений о форматах файлов."
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Сканирование страниц"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Изменение документа"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Использование документа"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/ru/ru.stamp b/help/ru/ru.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/ru/ru.stamp
+++ /dev/null
diff --git a/help/ru/save.page b/help/ru/save.page
deleted file mode 100644
index c387ebe..0000000
--- a/help/ru/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Сохранение в файл</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/ru/scanner.page b/help/ru/scanner.page
deleted file mode 100644
index fa30fa8..0000000
--- a/help/ru/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="ru">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Выбор сканера</title>
-
-    <p>
-    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 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/ru/scanning.page b/help/ru/scanning.page
deleted file mode 100644
index 0ec40e0..0000000
--- a/help/ru/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="ru">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Сканирование страницы</title>
-
-    <p>Чтобы отсканировать документ:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Откройте <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>
-
-    <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>
-      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/sk/adf.page b/help/sk/adf.page
deleted file mode 100644
index 8d55001..0000000
--- a/help/sk/adf.page
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Použitie automatického podávača dokumentov</title>
-
-    <p>Ak váš skener obsahuje automatický podávač dokumentov (ADF), môžete skenovať všetky stránky z podávača jedným z týchto spôsobov:</p>
-      <steps>
-	<title/>
-	<title>Používať klávesové skratky</title>
-	<item>
-	  <p>Stlač <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>Kliknite na šípku napravo od tlačidla „Skenovať“.</p>
-	</item>
-	<item>
-	  <p>Zvoľte „Všetky stránky z podávača“.</p>
-	  <media type="image" src="figures/scan_toolbar.png"/>
-	</item>
-      </steps>
-    
-    
-    <note style="tip">
-    <p>
-    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/sk/brightness-contrast.page b/help/sk/brightness-contrast.page
deleted file mode 100644
index 6456228..0000000
--- a/help/sk/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Nastaviť jas a kontrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/sk/crop.page b/help/sk/crop.page
deleted file mode 100644
index 0bdedd9..0000000
--- a/help/sk/crop.page
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Orezávanie</title>
-
-    <p>
-    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>Použitím pravého tlačidla</title>
-      <item><p>Kliknite pravým tlačidlom kdekoľvek v oblasti obrázku a vyberte „Orezanie“.</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>Kliknite a podržte rámec, potom ho premiestnite do požadovanej pozície.</p></item>
-    </steps>
-    
-    <steps>
-      <title>Use a Menu</title>
-      <item><p>Prejdite do ponuky <guiseq><gui>Stránka</gui><gui>Orezanie</gui></guiseq>.</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>Kliknite a podržte rámec, potom ho premiestnite do požadovanej pozície.</p></item>
-    </steps>
-    
-    <steps>
-      <title>Použitím panela nástrojov</title>
-      <item><p>Kliknite na tlačidlo „<gui>Orezanie</gui>“ v paneli nástrojov.</p>
-	    <note style="tip"><p>This is the same as choosing "Custom" in step 2 of the
-	      aforementioned methods.</p></note></item>      
-      <item><p>Pretiahnutím okrajov rámca nastavíte požadované rozmery a pozíciu.</p></item>
-
-    </steps>
-    
-    <note><p>Na každú novú skenovanú stránku sa použije predchádzajúce orezanie.</p></note>
-</page>
diff --git a/help/sk/dpi.page b/help/sk/dpi.page
deleted file mode 100644
index aaccbc2..0000000
--- a/help/sk/dpi.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Nastavenie rozlíšenia skenovania</title>
-
-    <p>
-    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>Dostupné rozlíšenia skenovania pre oba typy dokumentov (text a fotografia) sú rovnaké a sú vypísané v nasledujúcej tabuľke:</p>
-    
-    <table frame="bottom left right" rules="rows cols" shade="rows">
-	<tr>
-		<td><p><em>Rozlíšenie textu</em></p></td>
-		<td><p><em>Rozlíšenie fotografie</em></p></td>
-	</tr>
-	<tr>
-		<td><p>75 dpi (koncept)</p></td>
-		<td><p>75 dpi (koncept)</p></td>
-	</tr>
-	<tr>
-		<td><p>150 dpi (predvolené)</p></td>
-		<td><p>150 dpi</p></td>
-	</tr>
-	<tr>
-		<td><p>300 dpi</p></td>
-		<td><p>300 dpi (predvolené)</p></td>
-	</tr>
-	<tr>
-		<td><p>600 dpi</p></td>
-		<td><p>600 dpi</p></td>
-	</tr>
-	<tr>
-		<td><p>1200 dpi (vysoké rozlíšenie)</p></td>
-		<td><p>1200 dpi (vysoké rozlíšenie)</p></td>
-	</tr>
-	<tr>
-		<td><p>2400 dpi</p></td>
-		<td><p>2400 dpi</p></td>
-	</tr>
-    </table>
-    
-    <note style="important"><p><gui><em>Textové</em></gui> dokumenty sú vždy skenované čierno bielo, zatiaľ čo <gui><em>fotografické</em></gui> dokumenty sú vždy skenované vo farbe, v každom rozlíšení!</p>
-    </note>
-
-</page>
diff --git a/help/sk/email.page b/help/sk/email.page
deleted file mode 100644
index db513b0..0000000
--- a/help/sk/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Odosielanie prostredníctvom emailu</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/sk/index.page b/help/sk/index.page
deleted file mode 100644
index 3836d99..0000000
--- a/help/sk/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="sk">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Príručka k programu Jednoduché skenovanie</title>
-    
-    <section id="acquire" style="2column">
-        <title>Skenovanie stránok</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Úprava dokumentu</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Použitie dokumentu</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan klávesové skratky</title>
-    </section>
-</page>
diff --git a/help/sk/legal.xml b/help/sk/legal.xml
deleted file mode 100644
index fe265d1..0000000
--- a/help/sk/legal.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Táto práca je vytvorená pod licenciou <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/sk/print.page b/help/sk/print.page
deleted file mode 100644
index 09b4739..0000000
--- a/help/sk/print.page
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Tlač</title>
-
-    <p>Aplikácia <app>Jednoduché skenovanie</app> umožňuje tlač skenovaného dokumentu priamo prostredníctvom svojho rozhrania, bez nutnosti uloženia dokumentu. Táto funkcia vytvára z aplikácie <app>Jednoduché skenovanie</app> veľmi pohodlný nástroj na tvorbu kópií dokumentov a fotografií.</p>
-    <steps>
-      <title>Na vytlačenie dokumentu</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/sk/quality.page b/help/sk/quality.page
deleted file mode 100644
index 13ea355..0000000
--- a/help/sk/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/sk/reorder.page b/help/sk/reorder.page
deleted file mode 100644
index f23ea92..0000000
--- a/help/sk/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Usporiadanie stránok</title>
-
-    <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>
-    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/sk/rotate.page b/help/sk/rotate.page
deleted file mode 100644
index 3720af5..0000000
--- a/help/sk/rotate.page
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Otočenie stránky</title>
-
-    <p>
-    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>Použitie skratiek</title>
-      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
-      <item><p>Stlačte jednu z nasledovných klávesových skratiek:</p>
-	<table frame="bottom left right" rules="rows cols" shade="rows">
-	<tr>
-		<td><p><em>Príkaz</em></p></td>
-		<td><p><em>Klávesová skratka</em></p></td>
-	</tr>
-	<tr>
-		<td><p>Otočenie doľava</p></td>
-		<td><p><key>[</key> (ľavá hranatá zátvorka)</p></td>
-	</tr>
-	<tr>
-		<td><p>Otočenie doprava</p></td>
-		<td><p><key>]</key> (pravá hranatá zátvorka)</p></td>
-	</tr>
-	</table>
-      </item>
-    </steps>
-    
-    <note><p>Pre každú novú skenovanú stránku sa použije predchádzajúce otočenie.</p></note>
-</page>
diff --git a/help/sk/save.page b/help/sk/save.page
deleted file mode 100644
index c5e8881..0000000
--- a/help/sk/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Ukladanie do súboru</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Stlačte tlačidlo „Uložiť“.</p>
-      </item>
-    </steps>
-    
-    
-<table frame="bottom left right top" rules="rows cols" shade="rows">
-	<title>Podporované typy súborov</title>
-	<tr>
-		<td><p><em>Typ</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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/sk/scanner.page b/help/sk/scanner.page
deleted file mode 100644
index 8ad23b9..0000000
--- a/help/sk/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="sk">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Výber skenera</title>
-
-    <p>
-    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 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/sk/scanning.page b/help/sk/scanning.page
deleted file mode 100644
index cd4e781..0000000
--- a/help/sk/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="sk">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Skenovanie stránky</title>
-
-    <p>Pre skenovanie dokumentu z vášho skenera:</p>
-    <steps>
-      <item><p>Pripojte skener k vášmu počítaču a zapnite ho .</p></item>
-      <item><p>Otvorte aplikáciu <app>Jednoduché skenovanie</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>
-
-    <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>
-      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/sk/sk.po b/help/sk/sk.po
index 191b278..247d924 100644
--- a/help/sk/sk.po
+++ b/help/sk/sk.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-08-16 18:26+0000\n"
 "Last-Translator: Dusan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -26,54 +26,6 @@ msgstr ""
 "  Dusan Kazik https://launchpad.net/~prescott66\n"
 "  Eduard Hummel https://launchpad.net/~eduardhummel"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr "Ali Shtarbanov"
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-"<media type=\"image\" src=\"figures/icon.png\"/> Príručka k programu "
-"Jednoduché skenovanie"
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Skenovanie stránok"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Úprava dokumentu"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Použitie dokumentu"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr "Simple Scan klávesové skratky"
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -373,6 +325,54 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Príručka k programu "
+"Jednoduché skenovanie"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Skenovanie stránok"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Úprava dokumentu"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Použitie dokumentu"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr "Simple Scan klávesové skratky"
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/sk/sk.stamp b/help/sk/sk.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/sk/sk.stamp
+++ /dev/null
diff --git a/help/sl/adf.page b/help/sl/adf.page
deleted file mode 100644
index 7a6f48b..0000000
--- a/help/sl/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Using an Automatic Document Feeder</title>
-
-    <p>
-    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 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/sl/brightness-contrast.page b/help/sl/brightness-contrast.page
deleted file mode 100644
index d7b039f..0000000
--- a/help/sl/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/sl/crop.page b/help/sl/crop.page
deleted file mode 100644
index 8c11418..0000000
--- a/help/sl/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Cropping</title>
-
-    <p>
-    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/sl/dpi.page b/help/sl/dpi.page
deleted file mode 100644
index 1b55e3b..0000000
--- a/help/sl/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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/sl/email.page b/help/sl/email.page
deleted file mode 100644
index a3b754f..0000000
--- a/help/sl/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Sending via Email</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/sl/index.page b/help/sl/index.page
deleted file mode 100644
index ecad2ed..0000000
--- a/help/sl/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="sl">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modifying the Document</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Using the Document</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/sl/legal.xml b/help/sl/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/sl/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/sl/print.page b/help/sl/print.page
deleted file mode 100644
index 82dfe7c..0000000
--- a/help/sl/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Printing</title>
-
-    <p>
-    <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/sl/quality.page b/help/sl/quality.page
deleted file mode 100644
index 95e862b..0000000
--- a/help/sl/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/sl/reorder.page b/help/sl/reorder.page
deleted file mode 100644
index 2c6d5a5..0000000
--- a/help/sl/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordering Pages</title>
-
-    <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>
-    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/sl/rotate.page b/help/sl/rotate.page
deleted file mode 100644
index 30dc58c..0000000
--- a/help/sl/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/sl/save.page b/help/sl/save.page
deleted file mode 100644
index 76e14b1..0000000
--- a/help/sl/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Saving to a File</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/sl/scanner.page b/help/sl/scanner.page
deleted file mode 100644
index 9d570ca..0000000
--- a/help/sl/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="sl">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecting a Scanner</title>
-
-    <p>
-    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 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/sl/scanning.page b/help/sl/scanning.page
deleted file mode 100644
index 2616f4a..0000000
--- a/help/sl/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="sl">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer 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>
-
-    <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>
-      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/sl/sl.po b/help/sl/sl.po
index dcb18f6..3168f04 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2012-07-23 09:35+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:31+0000\n"
+"Last-Translator: Mitja <Unknown>\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: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Mitja https://launchpad.net/~mitja-pitko"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr ""
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -252,7 +206,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/dpi.page:9
 msgid "Setting the Scan Resolution"
-msgstr ""
+msgstr "Nastavitve ločljivosti skeniranja"
 
 #. (itstool) path: page/p
 #: C/dpi.page:11
@@ -335,7 +289,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/email.page:9
 msgid "Sending via Email"
-msgstr ""
+msgstr "Pošiljanje po e-pošti"
 
 #. (itstool) path: page/p
 #: C/email.page:11
@@ -357,6 +311,52 @@ msgstr ""
 #. (itstool) path: page/p
 #: C/email.page:21
 msgid "See <link xref=\"save\"/> for more information about file formats."
+msgstr "Poglej  <link xref=\"save\"/> za več podatkov o datotečnem formatu."
+
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr ""
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Skeniraj strani"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Spreminjanje dokumneta"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Uporaba dokumentov"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
 msgstr ""
 
 #. (itstool) path: p/link
@@ -367,7 +367,7 @@ msgstr ""
 #. (itstool) path: license/p
 #: C/legal.xml:3
 msgid "This work is licensed under a <_:link-1/>."
-msgstr ""
+msgstr "To delo je licencirano pod a <_:link-1/>."
 
 #. (itstool) path: license/p
 #: C/legal.xml:6
@@ -432,7 +432,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/reorder.page:9
 msgid "Reordering Pages"
-msgstr ""
+msgstr "Preurejanje strani"
 
 #. (itstool) path: page/p
 #: C/reorder.page:11
@@ -550,7 +550,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/save.page:9
 msgid "Saving to a File"
-msgstr ""
+msgstr "Shrani v datoteko"
 
 #. (itstool) path: item/p
 #: C/save.page:13
@@ -654,7 +654,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/scanner.page:9
 msgid "Selecting a Scanner"
-msgstr ""
+msgstr "Izbira skenerja"
 
 #. (itstool) path: page/p
 #: C/scanner.page:11
@@ -681,7 +681,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/scanning.page:10
 msgid "Scanning a Page"
-msgstr ""
+msgstr "Skeniranje strani"
 
 #. (itstool) path: page/p
 #: C/scanning.page:12
diff --git a/help/sl/sl.stamp b/help/sl/sl.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/sl/sl.stamp
+++ /dev/null
diff --git a/help/sr/adf.page b/help/sr/adf.page
deleted file mode 100644
index 075810a..0000000
--- a/help/sr/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Using an Automatic Document Feeder</title>
-
-    <p>
-    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 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/sr/brightness-contrast.page b/help/sr/brightness-contrast.page
deleted file mode 100644
index d60c13f..0000000
--- a/help/sr/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/sr/crop.page b/help/sr/crop.page
deleted file mode 100644
index a56bd17..0000000
--- a/help/sr/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Cropping</title>
-
-    <p>
-    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/sr/dpi.page b/help/sr/dpi.page
deleted file mode 100644
index 1ff5def..0000000
--- a/help/sr/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Setting the Scan Resolution</title>
-
-    <p>
-    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/sr/email.page b/help/sr/email.page
deleted file mode 100644
index 9a2d810..0000000
--- a/help/sr/email.page
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Sending via Email</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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.
-    </p>
-</page>
diff --git a/help/sr/index.page b/help/sr/index.page
deleted file mode 100644
index cadba7d..0000000
--- a/help/sr/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="sr">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Modifying the Document</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Using the Document</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/sr/legal.xml b/help/sr/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/sr/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/sr/print.page b/help/sr/print.page
deleted file mode 100644
index fc0fff1..0000000
--- a/help/sr/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Printing</title>
-
-    <p>
-    <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/sr/quality.page b/help/sr/quality.page
deleted file mode 100644
index 94b1967..0000000
--- a/help/sr/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/sr/reorder.page b/help/sr/reorder.page
deleted file mode 100644
index ad8166a..0000000
--- a/help/sr/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Reordering Pages</title>
-
-    <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>
-    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/sr/rotate.page b/help/sr/rotate.page
deleted file mode 100644
index 1caffbf..0000000
--- a/help/sr/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/sr/save.page b/help/sr/save.page
deleted file mode 100644
index f58f195..0000000
--- a/help/sr/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Saving to a File</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/sr/scanner.page b/help/sr/scanner.page
deleted file mode 100644
index 7c8a375..0000000
--- a/help/sr/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="sr">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Selecting a Scanner</title>
-
-    <p>
-    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 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/sr/scanning.page b/help/sr/scanning.page
deleted file mode 100644
index 4d69532..0000000
--- a/help/sr/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="sr">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer 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>
-
-    <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>
-      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/sr/sr.po b/help/sr/sr.po
index 840b609..882cda5 100644
--- a/help/sr/sr.po
+++ b/help/sr/sr.po
@@ -7,67 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2013-03-25 17:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@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: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr ""
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -357,6 +311,52 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr ""
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/sr/sr.stamp b/help/sr/sr.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/sr/sr.stamp
+++ /dev/null
diff --git a/help/sv/sv.po b/help/sv/sv.po
new file mode 100644
index 0000000..36f7723
--- /dev/null
+++ b/help/sv/sv.po
@@ -0,0 +1,1000 @@
+# Swedish translation for simple-scan.
+# Copyright © 2017 simple-scan's COPYRIGHT HOLDER
+# This file is distributed under the same license as the simple-scan package.
+# Isak Östlund <translate@catnip.nu>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan master\n"
+"POT-Creation-Date: 2017-08-10 16:29+0000\n"
+"PO-Revision-Date: 2017-09-18 13:58+0200\n"
+"Last-Translator: Isak Östlund <translate@catnip.nu>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.3\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr ""
+"Isak Östlund <translate@catnip.nu>, 2017\n"
+"Skicka synpunkter på översättningen till\n"
+"<tp-sv@listor.tp-sv.se>."
+
+#. (itstool) path: page/title
+#: C/adf.page:9
+msgid "Using an Automatic Document Feeder"
+msgstr "Använda en automatisk dokumentmatare"
+
+#. (itstool) path: page/p
+#: C/adf.page:11
+msgid ""
+"If your scanner features an Automatic Document Feeder (ADF) you can scan all "
+"the pages from the feeder via one of following methods:"
+msgstr ""
+"Ifall din bildläsare har en automatisk dokumentmatare (ADF) kan du skanna "
+"alla sidor från mataren med en av följande metoder:"
+
+#. (itstool) path: steps/title
+#: C/adf.page:16
+msgid "Use a Keyboard Shortcut"
+msgstr "Använd en tangentbordsgenväg"
+
+#. (itstool) path: item/p
+#: C/adf.page:18
+msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgstr "Tryck <keyseq><key>Ctrl</key><key>F</key></keyseq>"
+
+#. (itstool) path: steps/title
+#: C/adf.page:23 C/crop.page:27 C/rotate.page:28
+msgid "Use a Menu"
+msgstr "Använd en meny"
+
+#. (itstool) path: item/p
+#: C/adf.page:25
+msgid ""
+"Navigate to <guiseq><gui>Document</gui> <gui>Scan</gui><gui>All Pages From "
+"Feeder</gui></guiseq>."
+msgstr ""
+"Navigera till <guiseq><gui>Dokument</gui> <gui>Skanna</gui><gui>Alla sidor "
+"från matare</gui></guiseq>."
+
+#. (itstool) path: steps/title
+#: C/adf.page:32
+msgid "Use the Toolbar Buttons"
+msgstr "Använd knapparna i verktygsfältet"
+
+#. (itstool) path: item/p
+#: C/adf.page:34
+msgid "Click on the arrow to the right of the \"Scan\" button."
+msgstr "Klicka på pilen till höger om knappen \"Skanna\"."
+
+#. (itstool) path: item/p
+#: C/adf.page:37
+msgid "Choose \"All Pages From Feeder\"."
+msgstr "Välj \"Alla sidor från matare\"."
+
+#. (itstool) path: item/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/adf.page:38 C/scanning.page:20
+msgctxt "_"
+msgid ""
+"external ref='figures/scan_toolbar.png' "
+"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+msgstr ""
+"external ref='figures/scan_toolbar.png' "
+"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
+
+#. (itstool) path: note/p
+#: C/adf.page:44
+msgid ""
+"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."
+msgstr ""
+"Som standard kommer båda sidor av ett papper att skannas ifall din "
+"bildläsare har sådan funktionalitet. Du kan välja inläsningssida via menyn "
+"<guiseq><gui>Dokument</gui><gui>Inställningar</gui></guiseq>."
+
+#. (itstool) path: note/media
+#. (itstool) path: page/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/adf.page:48 C/dpi.page:16 C/scanner.page:14
+msgctxt "_"
+msgid ""
+"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+msgstr ""
+"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+
+#. (itstool) path: page/title
+#: C/brightness-contrast.page:9
+msgid "Setting brightness and Contrast"
+msgstr "Ställa in ljusstyrka och kontrast"
+
+#. (itstool) path: page/p
+#: C/brightness-contrast.page:11
+msgid ""
+"Some scanners allow the user to adjust the brightness and contrast when "
+"scanning. If your scans come out too dark or too light you can adjust these "
+"settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> "
+"menu."
+msgstr ""
+"Vissa bildläsare låter användaren ställa in ljusstyrkan och kontrasten vid "
+"skanning. Ifall dina skanningar blir för mörka eller för ljusa kan du "
+"justera dessa inställningar via menyn <guiseq><gui>Dokument</"
+"gui><gui>Inställningar</gui></guiseq>."
+
+#. (itstool) path: page/title
+#: C/crop.page:9
+msgid "Cropping"
+msgstr "Beskärning"
+
+# TODO: apper -> appear
+#. (itstool) path: page/p
+#: C/crop.page:11
+msgid ""
+"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:"
+msgstr ""
+"Beskärningsfunktionen i <app>Enkel bildläsning</app> låter dig använda en "
+"del av en skannad bild. Du kan aktivera beskärning antingen före eller efter "
+"en skanning, och du kan alltid ändra beskärningsramens dimensioner. När "
+"beskärning är aktiverad visas en maskering över nuvarande sida med "
+"överflödet i grått. Du kan aktivera beskärning och välja önskade dimensioner "
+"via en av följande metoder:"
+
+#. (itstool) path: steps/title
+#: C/crop.page:19
+msgid "Use a Right Click"
+msgstr "Använd högerklick"
+
+#. (itstool) path: item/p
+#: C/crop.page:20
+msgid "Right click anywhere on the image area and select \"Crop\"."
+msgstr "Högerklicka någonstans på bilden och välj \"Beskär\"."
+
+#. (itstool) path: item/p
+#: C/crop.page:21
+msgid ""
+"Choose one of the fixed crop frames, or select \"Custom\" to manually set "
+"the crop frame's dimensions by dragging its borders."
+msgstr ""
+"Välj en av de fasta ramarna för beskärning, eller välj \"Anpassad\" för att "
+"manuellt ställa in beskärningsramens dimensioner genom att dra i dess kanter."
+
+#. (itstool) path: item/p
+#: C/crop.page:23 C/crop.page:30
+msgid "Click and hold the frame, then move it to the desired position."
+msgstr "Klicka och håll i ramen, flytta den sen till önskad position."
+
+#. (itstool) path: item/p
+#: C/crop.page:28
+msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
+msgstr "Navigera till menyn <guiseq><gui>Sida</gui><gui>Beskär</gui></guiseq>."
+
+#. (itstool) path: item/p
+#: C/crop.page:29
+msgid ""
+"Choose one of the fixed crop frames, or select \"Custom\" to manually adjust "
+"the frame's dimensions by dragging its borders."
+msgstr ""
+"Välj en av de fasta ramarna för beskärning, eller välj \"Anpassad\" för att "
+"justera ramens dimensioner manuellt genom att dra i dess kanter."
+
+#. (itstool) path: steps/title
+#: C/crop.page:34
+msgid "Use the Toolbar"
+msgstr "Använd verktygsfältet"
+
+#. (itstool) path: item/p
+#: C/crop.page:35
+msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
+msgstr "Klicka på knappen \"<gui>Beskär</gui>\" i verktygsfältet."
+
+#. (itstool) path: note/p
+#: C/crop.page:36
+msgid ""
+"This is the same as choosing \"Custom\" in step 2 of the aforementioned "
+"methods."
+msgstr ""
+"Det här är detsamma som att välja \"Anpassad\" i steg 2 av de tidigare "
+"nämnda metoderna."
+
+#. (itstool) path: item/p
+#: C/crop.page:38
+msgid ""
+"Drag the borders of the frame to set the desired dimensions and position."
+msgstr ""
+"Dra i ramens kanter för att ställa in önskade dimensioner och position."
+
+#. (itstool) path: note/p
+#: C/crop.page:42
+msgid "Each new scanned page will use the previous crop."
+msgstr "Nya skannade sidor kommer att använda föregående beskärning."
+
+#. (itstool) path: page/title
+#: C/dpi.page:9
+msgid "Setting the Scan Resolution"
+msgstr "Ställa in bildläsarupplösningen"
+
+#. (itstool) path: page/p
+#: C/dpi.page:11
+msgid ""
+"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."
+msgstr ""
+"Upplösningens standardvärde för dokumenttypen <gui><em>text</em></gui> är "
+"150 dpi (punkter per tum) och för <gui><em>foto</em></gui> är den 300 dpi. "
+"Du kan ändra dessa inställningar via menyn <guiseq><gui>Dokument</"
+"gui><gui>Inställningar</gui></guiseq>."
+
+#. (itstool) path: page/p
+#: C/dpi.page:18
+msgid ""
+"The available scanning resolutions for both document types (Text and Photo) "
+"are the same and are listed in the following table:"
+msgstr ""
+"Tillgängliga upplösningar vid skanning för båda dokumenttyper (text och "
+"foto) är desamma och visas i följande tabell:"
+
+#. (itstool) path: td/p
+#: C/dpi.page:23
+msgid "<em>Text Resolution</em>"
+msgstr "<em>Textupplösning</em>"
+
+#. (itstool) path: td/p
+#: C/dpi.page:24
+msgid "<em>Photo Resolution</em>"
+msgstr "<em>Fotoupplösning</em>"
+
+#. (itstool) path: td/p
+#: C/dpi.page:27 C/dpi.page:28
+msgid "75 dpi (draft)"
+msgstr "75 dpi (utkast)"
+
+#. (itstool) path: td/p
+#: C/dpi.page:31
+msgid "150 dpi (default)"
+msgstr "150 dpi (standard)"
+
+#. (itstool) path: td/p
+#: C/dpi.page:32
+msgid "150 dpi"
+msgstr "150 dpi"
+
+#. (itstool) path: td/p
+#: C/dpi.page:35
+msgid "300 dpi"
+msgstr "300 dpi"
+
+#. (itstool) path: td/p
+#: C/dpi.page:36
+msgid "300 dpi (default)"
+msgstr "300 dpi (standard)"
+
+#. (itstool) path: td/p
+#: C/dpi.page:39 C/dpi.page:40
+msgid "600 dpi"
+msgstr "600 dpi"
+
+#. (itstool) path: td/p
+#: C/dpi.page:43 C/dpi.page:44
+msgid "1200 dpi (high resolution)"
+msgstr "1200 dpi (hög upplösning)"
+
+#. (itstool) path: td/p
+#: C/dpi.page:47 C/dpi.page:48
+msgid "2400 dpi"
+msgstr "2400 dpi"
+
+#. (itstool) path: note/p
+#: C/dpi.page:52
+msgid ""
+"<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!"
+msgstr ""
+"<gui><em>Textdokument</em></gui> skannas alltid i svartvitt medan "
+"<gui><em>Fotodokument</em></gui> alltid skannas i färg, oavsett upplösning!"
+
+#. (itstool) path: page/title
+#: C/email.page:9
+msgid "Sending via Email"
+msgstr "Skicka via e-post"
+
+#. (itstool) path: page/p
+#: C/email.page:11
+msgid ""
+"To email the current document use the <guiseq><gui>Document</gui><gui>Email</"
+"gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your "
+"email program will be opened with a new message containing the scanned "
+"document as an attachment."
+msgstr ""
+"För att e-posta det nuvarande dokumentet, använd menyn "
+"<guiseq><gui>Dokument</gui><gui>E-post</gui></guiseq> (<keyseq><key>Ctrl</"
+"key><key>E</key></keyseq>). Ditt e-postprogram kommer att öppna ett nytt "
+"meddelande med det skannade dokumentet som en bilaga."
+
+#. (itstool) path: page/p
+#: C/email.page:16
+msgid ""
+"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."
+msgstr ""
+"Ifall dokumenttypen var satt till \"Text\" kommer e-postmeddelandet ha en "
+"PDF-fil för varje bifogad sida. Om dokumenttypen var satt till \"Foto\" har "
+"e-postmeddelandet istället en JPEG-fil för varje bifogad sida."
+
+#. (itstool) path: page/p
+#: C/email.page:21
+msgid "See <link xref=\"save\"/> for more information about file formats."
+msgstr "Se <link xref=\"save\"/> för mer information om filformat."
+
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr "Ali Shtarbanov"
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr "external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Manual för Enkel bildläsning"
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Skanna sidor"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Redigera dokumentet"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Använda dokumentet"
+
+#. (itstool) path: p/link
+#: C/legal.xml:4
+msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
+msgstr "Creative Commons Erkännande-Dela Lika 3.0 Unported"
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid "This work is licensed under a <_:link-1/>."
+msgstr "Detta verk är licensierat under licensen <_:link-1/>."
+
+#. (itstool) path: license/p
+#: C/legal.xml:6
+msgid ""
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
+msgstr ""
+"Som ett speciellt undantag ger upphovsrättsinnehavarna dig rätten att "
+"kopiera, ändra och distribuera exempelkoden i detta dokument på det sätt du "
+"väljer, utan restriktioner."
+
+#. (itstool) path: page/title
+#: C/print.page:9
+msgid "Printing"
+msgstr "Skriva ut"
+
+#. (itstool) path: page/p
+#: C/print.page:11
+msgid ""
+"<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."
+msgstr ""
+"<app>Enkel bildläsning</app> låter dig skriva ut ett skannat dokument direkt "
+"i gränssnittet, utan att först behöva spara dokumentet. Den här funktionen "
+"gör <app>Enkel bildläsning</app> till ett väldigt bekvämt verktyg för att "
+"göra kopior av dokument och fotografier."
+
+#. (itstool) path: steps/title
+#: C/print.page:17
+msgid "To Print a Document"
+msgstr "Att skriva ut ett dokument"
+
+#. (itstool) path: item/p
+#: C/print.page:19
+msgid ""
+"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."
+msgstr ""
+"Gå till menyn <guiseq><gui>Dokument</gui><gui>Skriv ut</gui> </guiseq> eller "
+"använd tangentbordsgenvägen <keyseq><key>Ctrl</key><key>P</key></keyseq>. "
+"Det här öppnar dialogrutan \"Skriv ut\"."
+
+#. (itstool) path: item/p
+#: C/print.page:25
+msgid ""
+"From the \"Print\" dialog box choose your desired printing settings and/or "
+"Print Preview the document, then press the \"Print\" button."
+msgstr ""
+"Välj önskade inställningar för utskriften från dialogrutan \"Skriv ut\" och/"
+"eller förhandsgranska utskriften, tryck sedan på knappen \"Skriv ut\"."
+
+#. (itstool) path: page/title
+#: C/quality.page:9
+msgid "Setting the Image Quality"
+msgstr "Ställa in bildkvaliteten"
+
+#. (itstool) path: page/p
+#: C/quality.page:11
+msgid ""
+"You can adjust the image quality that is used when the scan is converted to "
+"a file by changing this setting in the save dialog. Using a low quality will "
+"result in a small file size but may show some blurring or blockiness in the "
+"image. A high quality will keep all the scanned information but require a "
+"larger file size. See the <link href=\"https://en.wikipedia.org/wiki/"
+"Lossy_compression\">Lossy compression Wikipedia page</link> for more "
+"information."
+msgstr ""
+"Du kan justera bildkvaliteten som används när skanningen konverteras till en "
+"fil genom att ändra inställningen i dialogen spara. Låg kvalitet resulterar "
+"i liten filstorlek men kan göra bilden suddig eller blockeffekter synliga. "
+"Hög kvalitet behåller all skannad information men kräver en större "
+"filstorlek. Se <link href=\"https://sv.wikipedia.org/wiki/"
+"Destruktiv_komprimering\">Wikipedias artikel om destruktiv komprimering</"
+"link> för mer information."
+
+#. (itstool) path: page/title
+#: C/reorder.page:9
+msgid "Reordering Pages"
+msgstr "Ändra ordning på sidor"
+
+#. (itstool) path: page/p
+#: C/reorder.page:11
+msgid ""
+"To move a page, right click on it and choose <gui><em>Move Left</em></gui> "
+"or <gui><em>Move Right</em></gui>."
+msgstr ""
+"För att flytta en sida, högerklicka på den och välj <gui><em>Flytta åt "
+"vänster</em></gui> eller <gui><em>Flytta åt höger</em></gui>."
+
+#. (itstool) path: page/p
+#: C/reorder.page:16
+msgid ""
+"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."
+msgstr ""
+"Alternativt så kan du flytta en sida genom att först markera den och sedan "
+"välja <gui><em>Flytta åt vänster</em></gui> eller <gui><em>Flytta åt höger</"
+"em></gui> via menyn \"Sida\"."
+
+#. (itstool) path: page/title
+#: C/rotate.page:9
+msgid "Rotating a Page"
+msgstr "Rotera en sida"
+
+#. (itstool) path: page/p
+#: C/rotate.page:11
+msgid ""
+"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:"
+msgstr ""
+"I <app>Enkel bildläsning</app> kan du rotera en sida antingen före eller "
+"efter att sidan har skannats. Det finns för tillfället fyra sätt att rotera "
+"en sida på:"
+
+#. (itstool) path: steps/title
+#: C/rotate.page:17
+msgid "Use Toolbar Buttons"
+msgstr "Använd verktygsfältsknappar"
+
+#. (itstool) path: item/p
+#: C/rotate.page:18 C/rotate.page:29 C/rotate.page:35
+msgid "Select the page you want to rotate by clicking on it once."
+msgstr "Välj sidan du vill rotera genom att klicka på den."
+
+#. (itstool) path: item/p
+#: C/rotate.page:19
+msgid ""
+"Press one of the arrows on the toolbar to rotate the page in the desired "
+"direction."
+msgstr ""
+"Tryck på en av pilarna i verktygsfältet för att rotera sidan i önskad "
+"riktning."
+
+#. (itstool) path: steps/title
+#: C/rotate.page:22
+msgid "Use Right Click"
+msgstr "Högerklicka"
+
+#. (itstool) path: item/p
+#: C/rotate.page:23
+msgid "Right click on the page you want to rotate."
+msgstr "Högerklicka på den sida du vill rotera."
+
+#. (itstool) path: item/p
+#: C/rotate.page:24
+msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
+msgstr "Välj \"Rotera åt vänster\" eller \"Rotera åt höger\" i snabbmenyn."
+
+#. (itstool) path: item/p
+#: C/rotate.page:30
+msgid "Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
+msgstr ""
+"Klicka på menyn \"Sida\" och välj \"Rotera åt vänster\" eller \"Rotera åt "
+"höger\"."
+
+#. (itstool) path: steps/title
+#: C/rotate.page:34
+msgid "Use Shortcuts"
+msgstr "Använd genvägar"
+
+#. (itstool) path: item/p
+#: C/rotate.page:36
+msgid "Press one of the following shortcut keys:"
+msgstr "Tryck på en av följande snabbtangenter:"
+
+#. (itstool) path: td/p
+#: C/rotate.page:39
+msgid "<em>Command</em>"
+msgstr "<em>Kommando</em>"
+
+#. (itstool) path: td/p
+#: C/rotate.page:40
+msgid "<em>Shortcut Key</em>"
+msgstr "<em>Snabbtangent</em>"
+
+#. (itstool) path: td/p
+#: C/rotate.page:43
+msgid "Rotate Left"
+msgstr "Rotera åt vänster"
+
+#. (itstool) path: td/p
+#: C/rotate.page:44
+msgid "<key>[</key> (left bracket)"
+msgstr "<key>[</key> (vänster hakparentes)"
+
+#. (itstool) path: td/p
+#: C/rotate.page:47
+msgid "Rotate Right"
+msgstr "Rotera åt höger"
+
+#. (itstool) path: td/p
+#: C/rotate.page:48
+msgid "<key>]</key> (right bracket)"
+msgstr "<key>]</key> (höger hakparentes)"
+
+#. (itstool) path: note/p
+#: C/rotate.page:54
+msgid "Each new scanned page will use the previous rotation."
+msgstr "Nya skannade sidor kommer använda föregående rotering."
+
+#. (itstool) path: page/title
+#: C/save.page:9
+msgid "Saving to a File"
+msgstr "Spara till fil"
+
+#. (itstool) path: item/p
+#: C/save.page:13
+msgid ""
+"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>)."
+msgstr ""
+"Navigera till menyn <guiseq><gui>Dokument</gui><gui>Spara som</gui></guiseq> "
+"(eller tryck <keyseq><key>Skift</key><key>Ctrl</key><key>S</key></keyseq>)."
+
+#. (itstool) path: item/p
+#: C/save.page:18
+msgid ""
+"From the \"Save As\" dialog box, choose one of the supported file types, or "
+"simply change the extension in the \"Name\" field."
+msgstr ""
+"Från dialogrutan \"Spara som\", välj en av de filtyper som stöds eller ändra "
+"filändelsen i fältet \"Namn\"."
+
+#. (itstool) path: item/p
+#: C/save.page:23
+msgid "Press the \"Save\" button."
+msgstr "Tryck på knappen \"Spara\"."
+
+#. (itstool) path: table/title
+#: C/save.page:29
+msgid "Supported File Types"
+msgstr "Filtyper som stöds"
+
+#. (itstool) path: td/p
+#: C/save.page:31
+msgid "<em>Type</em>"
+msgstr "<em>Typ</em>"
+
+#. (itstool) path: td/p
+#: C/save.page:32
+msgid "<em>Brief Description</em>"
+msgstr "<em>Kort beskrivning</em>"
+
+#. (itstool) path: td/p
+#: C/save.page:35
+msgid "PDF"
+msgstr "PDF"
+
+#. (itstool) path: td/p
+#: C/save.page:36
+msgid ""
+"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. The size of the PDF document "
+"is affected by the <link xref=\"quality\">image quality</link>. See the "
+"<link href=\"http://en.wikipedia.org/wiki/pdf\">PDF Wikipedia page</link> "
+"for more information."
+msgstr ""
+"En PDF-fil kan innehålla flera sidor, likt en bok, och är lätt att "
+"distribuera. Endast ett fåtal Linux-program kan redigera PDF-dokument, så "
+"detta format rekommenderas främst för arkivering. PDF-dokumentets filstorlek "
+"påverkas av <link xref=\"quality\">bildkvaliteten</link>. Se <link href="
+"\"https://sv.wikipedia.org/wiki/Portable_Document_Format\">Wikipedias "
+"artikel om PDF</link> för mer information."
+
+#. (itstool) path: td/p
+#: C/save.page:43
+msgid "JPEG"
+msgstr "JPEG"
+
+#. (itstool) path: td/p
+#: C/save.page:44
+msgid ""
+"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. The size of the JPEG file is affected by the <link xref="
+"\"quality\">image quality</link>. See the <link href=\"http://en.wikipedia."
+"org/wiki/jpeg\">JPEG Wikipedia page</link> for more information."
+msgstr ""
+"JPEG är filformatet som digitalkameror använder för att spara bilder. En "
+"JPEG-fil är relativt liten, mycket enkel att distribuera, och lämplig att "
+"laddas upp på sociala nätverk. De flesta operativsystem inkluderar en JPEG-"
+"redigerare. Om du har skannat ett flertal sidor så skapas en JPEG-fil för "
+"varje sida. Använd detta filformat ifall du vill redigera eller ladda upp de "
+"skannade bilderna. JPEG-filens filstorlek påverkas av <link xref=\"quality"
+"\">bildkvaliteten</link>. Se <link href=\"https://sv.wikipedia.org/wiki/JPEG"
+"\">Wikipedias artikel om JPEG</link> för mer information."
+
+#. (itstool) path: td/p
+#: C/save.page:53
+msgid "PNG"
+msgstr "PNG"
+
+#. (itstool) path: td/p
+#: C/save.page:54
+msgid ""
+"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 Wikipedia page</link> for more "
+"information."
+msgstr ""
+"PNG-filer innehåller rådata från bildläsaren. Det här gör dem mycket stora "
+"och olämpliga för distribuering. Om du har skannat in ett flertal sidor "
+"skapas en PNG-fil för varje sida. Se <link href=\"https://sv.wikipedia.org/"
+"wiki/PNG\">Wikipedias artikel om PNG</link> för mer information."
+
+#. (itstool) path: td/p
+#: C/save.page:61
+msgid "TIFF"
+msgstr "TIFF"
+
+#. (itstool) path: td/p
+#: C/save.page:62
+msgid ""
+"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 Wikipedia page</link> for more "
+"information."
+msgstr ""
+"TIFF-filer innehåller rådata från bildläsaren. Det här gör dem väldigt stora "
+"och olämpliga för distribuering. Om du har skannat flera sidor skapas en "
+"TIFF-fil för varje sida. Se <link href=\"http://en.wikipedia.org/wiki/"
+"Tagged_Image_File_Format\">Wikipedias artikel om TIFF</link> (engelska) för "
+"mer information."
+
+#. (itstool) path: page/title
+#: C/scanner.page:9
+msgid "Selecting a Scanner"
+msgstr "Val av bildläsare"
+
+#. (itstool) path: page/p
+#: C/scanner.page:11
+msgid ""
+"If you have multiple scanning devices you can change the selected device "
+"from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
+msgstr ""
+"Ifall du har flera bildläsare kan du ändra vald enhet via menyn "
+"<guiseq><gui>Dokument</gui><gui>Inställningar</gui></guiseq>."
+
+#. (itstool) path: page/p
+#: C/scanner.page:15
+msgid ""
+"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."
+msgstr ""
+"Dina lokala bildläsare upptäcks automatiskt varje gång du startar <app>Enkel "
+"bildläsning</app> samt varje gång du kopplar in en USB-bildläsare. Ifall du "
+"kopplar in en nätverksansluten bildläsare medan <app>Enkel bildläsning</app> "
+"körs behöver du starta om <app>Enkel bildläsning</app> för att bildläsaren "
+"ska upptäckas."
+
+#. (itstool) path: info/title
+#: C/scanning.page:6
+msgctxt "sort"
+msgid "0"
+msgstr "0"
+
+#. (itstool) path: page/title
+#: C/scanning.page:10
+msgid "Scanning a Page"
+msgstr "Skanna en sida"
+
+#. (itstool) path: page/p
+#: C/scanning.page:12
+msgid "To scan a document from your scanner:"
+msgstr "För att skanna ett dokument från din bildläsare:"
+
+#. (itstool) path: item/p
+#: C/scanning.page:16
+msgid "Connect the scanner to your computer and power it on."
+msgstr "Koppla in bildläsare till din dator och starta den."
+
+#. (itstool) path: item/p
+#: C/scanning.page:17
+msgid "Open <app>Simple Scan</app>."
+msgstr "Öppna <app>Enkel bildläsning</app>."
+
+#. (itstool) path: item/p
+#: C/scanning.page:18
+msgid ""
+"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>."
+msgstr ""
+"Klicka på pilen till höger om knappen \"Skanna\" och välj den dokumenttyp "
+"som du skannar: <em>Foto</em> eller <em>Text</em>."
+
+#. (itstool) path: item/p
+#: C/scanning.page:21
+msgid ""
+"Click the \"Scan\" button on the toolbar (or press <keyseq><key>Ctrl</"
+"key><key>1</key></keyseq>)."
+msgstr ""
+"Klicka på knappen \"Skanna\" i verktygsfältet (eller tryck "
+"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
+
+#. (itstool) path: note/p
+#: C/scanning.page:24
+msgid ""
+"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."
+msgstr ""
+"Sidan visas medan den skannas. För att när som helst avbryta skanningen, "
+"tryck på tangenten <key>Esc</key>. Varje sida du skannar placeras i slutet "
+"av dokumentet."
+
+#. (itstool) path: page/p
+#: C/scanning.page:29
+msgid ""
+"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."
+msgstr ""
+"Dokumentets typ kan även ändras via menyn <guiseq><gui>Dokument</gui> "
+"<gui>Skanna</gui></guiseq>. Välj <gui><em>Text</em></gui> ifall du vill att "
+"dokumentet snabbt ska skannas i svartvitt; välj <gui><em>Foto</em></gui> för "
+"en högupplöst skanning i färg. Se <link xref=\"dpi\"/> för mer detaljer och "
+"fler alternativ."
+
+#~ msgid "Simple Scan Shortcuts"
+#~ msgstr "Genvägar i Enkel bildläsning"
+
+#~ msgid "Externally View a Page"
+#~ msgstr "Visa en sida externt"
+
+#~ msgid ""
+#~ "Double click a scanned page to view it with your default image viewer. "
+#~ "This action creates a TIFF file containing the raw data from the scanner "
+#~ "in your /tmp directory named \"<em>scanned-pageXXXXXX.tiff</em>\"."
+#~ msgstr ""
+#~ "Dubbelklicka på en skannad sida för att visa den i din "
+#~ "standardbildvisare. Denna åtgärd skapar en TIFF-fil med rådata från "
+#~ "skannern i katalogen /tmp under namnet \"<em>scanned-pageXXXXXX.tiff</em>"
+#~ "\"."
+
+#~ msgid ""
+#~ "If you double click the scanned page after crop is enabled, only the "
+#~ "cropped part will open. You can, therefore, use this feature to check "
+#~ "more accurately whether you have positioned the crop frame exactly where "
+#~ "you wanted it."
+#~ msgstr ""
+#~ "Om du dubbelklickar på den skannade sidan efter att beskär har aktiverats "
+#~ "så öppnas endast den beskärda delen. Du kan därför använda den här "
+#~ "funktionen för att mer exakt kunna avgöra ifall du har placerat "
+#~ "beskärningsramen precis där du vill ha den."
+
+#~ msgid "Deleting a Page"
+#~ msgstr "Radera en sida"
+
+#~ msgid "Right click on the page you want to delete."
+#~ msgstr "Högerklicka på den sida du vill radera."
+
+#~ msgid "Choose \"Delete\" from the context menu."
+#~ msgstr "Välj \"Radera\" från snabbmenyn."
+
+#~ msgid "Use a Shortcut Key"
+#~ msgstr "Använd ett kortkommando"
+
+#~ msgid "Select the page you want to delete (by clicking on it once)."
+#~ msgstr "Välj den sida du vill radera (genom att klicka på den)."
+
+#~ msgid "Press the <key>Delete</key> key on the keyboard."
+#~ msgstr "Tryck på tangenten <key>Delete</key>."
+
+#~ msgid "Go to the \"Page\" menu and click \"Delete\"."
+#~ msgstr "Gå till menyn \"Sida\" och klicka på \"Ta bort\"."
+
+#~ msgid "WARNING: The deletion of a page cannot be undone!"
+#~ msgstr "VARNING: Radering av en sida kan inte ångras!"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Tangentbordsgenvägar"
+
+#~ msgid "Shortcut"
+#~ msgstr "Genväg"
+
+#~ msgid "Description"
+#~ msgstr "Beskrivning"
+
+#~ msgid "<keyseq><key>Alt</key><key>D</key></keyseq>"
+#~ msgstr "<keyseq><key>Alt</key><key>D</key></keyseq>"
+
+#~ msgid "Document menu"
+#~ msgstr "Dokumentmenyn"
+
+#~ msgid "<keyseq><key>Alt</key><key>H</key></keyseq>"
+#~ msgstr "<keyseq><key>Alt</key><key>H</key></keyseq>"
+
+#~ msgid "Help menu"
+#~ msgstr "Hjälpmeny"
+
+#~ msgid "<keyseq><key>Alt</key><key>P</key></keyseq>"
+#~ msgstr "<keyseq><key>Alt</key><key>P</key></keyseq>"
+
+#~ msgid "Page menu"
+#~ msgstr "Sidmeny"
+
+#~ msgid "<keyseq><key>Alt</key><key>F4</key></keyseq>"
+#~ msgstr "<keyseq><key>Alt</key><key>F4</key></keyseq>"
+
+#~ msgid "Close <app>Simple Scan</app>"
+#~ msgstr "Stäng <app>Enkel bildläsning</app>"
+
+#~ msgid "<keyseq><key>Ctrl</key><key>1</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>1</key></keyseq>"
+
+#~ msgid "Scan a single page"
+#~ msgstr "Läs in en enstaka sida"
+
+#~ msgid "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
+
+#~ msgid "Email the document"
+#~ msgstr "E-posta dokumentet"
+
+#~ msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+
+#~ msgid "Start a new document"
+#~ msgstr "Starta ett nytt dokument"
+
+#~ msgid "<keyseq><key>Ctrl</key><key>P</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>P</key></keyseq>"
+
+#~ msgid "Open the Print dialog box"
+#~ msgstr "Öppna dialogrutan för utskrift"
+
+#~ msgid "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+
+#~ msgid "Quit <app>Simple Scan</app>"
+#~ msgstr "Avsluta <app>Enkel bildläsning</app>"
+
+#~ msgid "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+
+#~ msgid "Save"
+#~ msgstr "Spara"
+
+#~ msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>"
+#~ msgstr "<keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>"
+
+#~ msgid "Save As"
+#~ msgstr "Spara som"
+
+#~ msgid "<key>Delete</key>"
+#~ msgstr "<key>Delete</key>"
+
+#~ msgid "Delete selected page"
+#~ msgstr "Ta bort den valda sidan"
+
+#~ msgid "<key>End</key>"
+#~ msgstr "<key>End</key>"
+
+#~ msgid "Select the last page of the document"
+#~ msgstr "Välj dokumentets sista sida"
+
+#~ msgid "<key>Esc</key>"
+#~ msgstr "<key>Esc</key>"
+
+#~ msgid "Stop the current scan"
+#~ msgstr "Stoppa den aktuella bildläsningen"
+
+#~ msgid "<key>F1</key>"
+#~ msgstr "<key>F1</key>"
+
+#~ msgid "Help"
+#~ msgstr "Hjälp"
+
+#~ msgid "<key>F10</key>"
+#~ msgstr "<key>F10</key>"
+
+#~ msgid "Document Menu (open/close)"
+#~ msgstr "Dokumentmenyn (öppna/stäng)"
+
+#~ msgid "<key>Home</key>"
+#~ msgstr "<key>Home</key>"
+
+#~ msgid "Select the first page of the document"
+#~ msgstr "Välj dokumentets första sida"
+
+#~ msgid "<key>[</key>"
+#~ msgstr "<key>[</key>"
+
+#~ msgid "<key>]</key>"
+#~ msgstr "<key>]</key>"
diff --git a/help/uk/adf.page b/help/uk/adf.page
deleted file mode 100644
index 647bf5a..0000000
--- a/help/uk/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Користування автоматичним подавачем документів</title>
-
-    <p>
-    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 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/uk/brightness-contrast.page b/help/uk/brightness-contrast.page
deleted file mode 100644
index 4f53cd6..0000000
--- a/help/uk/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/uk/crop.page b/help/uk/crop.page
deleted file mode 100644
index 2875cce..0000000
--- a/help/uk/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Обрізання</title>
-
-    <p>
-    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/uk/dpi.page b/help/uk/dpi.page
deleted file mode 100644
index 3e9ab32..0000000
--- a/help/uk/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Встановлення роздільної здатності сканування</title>
-
-    <p>
-    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/uk/email.page b/help/uk/email.page
deleted file mode 100644
index b63a2e0..0000000
--- a/help/uk/email.page
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Надсилання зображень електронною поштою</title>
-
-    <p>Щоб надіслати поточний документ електронною поштою, скористайтеся пунктом меню <guiseq><gui>Документ</gui><gui>Надіслати ел. поштою</gui></guiseq> (<keyseq><key>Ctrl</key><key>E</key></keyseq>). У відповідь на вибір цього пункту меню буде запущено типову програму для роботи з електронною поштою. До нового повідомлення буде одразу долучено сканований документ.</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>Докладніші дані щодо форматів файлів викладено у розділі <link xref="save"/>.</p>
-</page>
diff --git a/help/uk/index.page b/help/uk/index.page
deleted file mode 100644
index 15dfa46..0000000
--- a/help/uk/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="uk">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>Сканування сторінок</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>Внесення змін до документа</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>Використання документа</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/uk/legal.xml b/help/uk/legal.xml
deleted file mode 100644
index 5bec089..0000000
--- a/help/uk/legal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>Ця робота розповсюджується за умов дотримання <link href="http://creativecommons.org/licenses/by-sa/3.0/">ліцензії Creative Commons Attribution-Share Alike 3.0 Unported</link>.</p>
-<p>За виняткових обставин власники авторських прав можу надати вам дозвіл копіювати, змінювати і розповсюджувати приклади коду, що містяться у цьому документі, за довільних умов, без обмежень.</p>
-</license>
diff --git a/help/uk/print.page b/help/uk/print.page
deleted file mode 100644
index 6091713..0000000
--- a/help/uk/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Друк</title>
-
-    <p>
-    <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/uk/quality.page b/help/uk/quality.page
deleted file mode 100644
index 6771314..0000000
--- a/help/uk/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/uk/reorder.page b/help/uk/reorder.page
deleted file mode 100644
index 6a244db..0000000
--- a/help/uk/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Перевпорядкування сторінок</title>
-
-    <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>
-    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/uk/rotate.page b/help/uk/rotate.page
deleted file mode 100644
index 6b56ffb..0000000
--- a/help/uk/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/uk/save.page b/help/uk/save.page
deleted file mode 100644
index 65e2b47..0000000
--- a/help/uk/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>Збереження даних до файла</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/uk/scanner.page b/help/uk/scanner.page
deleted file mode 100644
index f51950e..0000000
--- a/help/uk/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="uk">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Вибір сканера</title>
-
-    <p>
-    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 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/uk/scanning.page b/help/uk/scanning.page
deleted file mode 100644
index 96b73be..0000000
--- a/help/uk/scanning.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="uk">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Сканування сторінки</title>
-
-    <p>Щоб виконати сканування документа за допомогою сканера, виконайте такі дії:</p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Запустіть програму <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>
-
-    <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>
-      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/uk/uk.po b/help/uk/uk.po
index 929387c..f564ee1 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2012-07-23 16:26+0000\n"
 "Last-Translator: yurchor <Unknown>\n"
 "Language-Team: Ukrainian <uk@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: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 "Language: uk\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
@@ -27,52 +27,6 @@ msgstr ""
 "  Yuri Chornoivan https://launchpad.net/~yurchor-gmail\n"
 "  yurchor https://launchpad.net/~yurchor-deactivatedaccount"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "Сканування сторінок"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "Внесення змін до документа"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "Використання документа"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -369,6 +323,52 @@ msgstr ""
 "Докладніші дані щодо форматів файлів викладено у розділі <link "
 "xref=\"save\"/>."
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "Сканування сторінок"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "Внесення змін до документа"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "Використання документа"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/uk/uk.stamp b/help/uk/uk.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/uk/uk.stamp
+++ /dev/null
diff --git a/help/zh_TW/adf.page b/help/zh_TW/adf.page
deleted file mode 100644
index 3632181..0000000
--- a/help/zh_TW/adf.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>使用自動送紙器</title>
-
-    <p>
-    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 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/zh_TW/brightness-contrast.page b/help/zh_TW/brightness-contrast.page
deleted file mode 100644
index 07462a7..0000000
--- a/help/zh_TW/brightness-contrast.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-
-	<title>Setting brightness and Contrast</title>
-
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
-</page>
diff --git a/help/zh_TW/crop.page b/help/zh_TW/crop.page
deleted file mode 100644
index 5e8a579..0000000
--- a/help/zh_TW/crop.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>裁切</title>
-
-    <p>
-    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/zh_TW/dpi.page b/help/zh_TW/dpi.page
deleted file mode 100644
index 9523675..0000000
--- a/help/zh_TW/dpi.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>設定掃描解析度</title>
-
-    <p>
-    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/zh_TW/email.page b/help/zh_TW/email.page
deleted file mode 100644
index e5e078d..0000000
--- a/help/zh_TW/email.page
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>以電子郵件傳送</title>
-
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
-    <p>
-    If the document type 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>有關檔案格式的更多資訊，請見 <link xref="save"/>。</p>
-</page>
diff --git a/help/zh_TW/index.page b/help/zh_TW/index.page
deleted file mode 100644
index 3c902aa..0000000
--- a/help/zh_TW/index.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="zh-TW">
-
-	<info>
-		<credit type="author">
-			<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><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
-    
-    <section id="acquire" style="2column">
-        <title>掃描頁面</title>
-    </section>
-
-    <section id="modify" style="2column">
-        <title>修改文年</title>
-    </section>
-
-    <section id="use" style="2column">
-        <title>使用文件</title>
-    </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
-</page>
diff --git a/help/zh_TW/legal.xml b/help/zh_TW/legal.xml
deleted file mode 100644
index 46a7e88..0000000
--- a/help/zh_TW/legal.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/zh_TW/print.page b/help/zh_TW/print.page
deleted file mode 100644
index 725cd0d..0000000
--- a/help/zh_TW/print.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>列印</title>
-
-    <p>
-    <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/zh_TW/quality.page b/help/zh_TW/quality.page
deleted file mode 100644
index b184f29..0000000
--- a/help/zh_TW/quality.page
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-
-	<title>Setting the Image Quality</title>
-
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
-</page>
diff --git a/help/zh_TW/reorder.page b/help/zh_TW/reorder.page
deleted file mode 100644
index 99c4bc6..0000000
--- a/help/zh_TW/reorder.page
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>為頁面重新排序</title>
-
-    <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>
-    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/zh_TW/rotate.page b/help/zh_TW/rotate.page
deleted file mode 100644
index 66b546a..0000000
--- a/help/zh_TW/rotate.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Rotating a Page</title>
-
-    <p>
-    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/zh_TW/save.page b/help/zh_TW/save.page
deleted file mode 100644
index 6d2dfd2..0000000
--- a/help/zh_TW/save.page
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#use"/>
-    </info>
-  
-	<title>儲存至檔案</title>
-
-    <steps>
-      <item>
-	<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>
-	<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>
-	<p>Press the "Save" button.</p>
-      </item>
-    </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.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia 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.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia 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 Wikipedia 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 Wikipedia page</link>
-		for more information.
-		    </p></td>
-	</tr>
-
-</table>    
-</page>
diff --git a/help/zh_TW/scanner.page b/help/zh_TW/scanner.page
deleted file mode 100644
index 0dfc083..0000000
--- a/help/zh_TW/scanner.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="zh-TW">
-
-    <info>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>選取掃描器</title>
-
-    <p>
-    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 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/zh_TW/scanning.page b/help/zh_TW/scanning.page
deleted file mode 100644
index ad1c811..0000000
--- a/help/zh_TW/scanning.page
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="zh-TW">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>掃描頁面</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>開啟<app>掃描易</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>
-
-    <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>
-      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/zh_TW/zh_TW.po b/help/zh_TW/zh_TW.po
index 901d3c6..3d38724 100644
--- a/help/zh_TW/zh_TW.po
+++ b/help/zh_TW/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-25 14:55+0200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-02-16 05:12+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: 2016-12-19 05:09+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,52 +24,6 @@ msgstr ""
 "Launchpad Contributions:\n"
 "  Walter Cheuk https://launchpad.net/~wwycheuk"
 
-#. (itstool) path: credit/name
-#: C/index.page:7
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Ali Shtarbanov"
-msgstr ""
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:17
-msgctxt "_"
-msgid ""
-"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/index.page:17
-msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/index.page:20
-msgid "Scanning Pages"
-msgstr "掃描頁面"
-
-#. (itstool) path: section/title
-#: C/index.page:24
-msgid "Modifying the Document"
-msgstr "修改文年"
-
-#. (itstool) path: section/title
-#: C/index.page:28
-msgid "Using the Document"
-msgstr "使用文件"
-
-#. (itstool) path: section/title
-#: C/index.page:32
-msgid "Simple Scan Shortcuts"
-msgstr ""
-
 #. (itstool) path: page/title
 #: C/adf.page:9
 msgid "Using an Automatic Document Feeder"
@@ -359,6 +313,52 @@ msgstr ""
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr "有關檔案格式的更多資訊，請見 <link xref=\"save\"/>。"
 
+#. (itstool) path: credit/name
+#: C/index.page:7
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Ali Shtarbanov"
+msgstr ""
+
+#. (itstool) path: title/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:17
+msgctxt "_"
+msgid ""
+"external ref='figures/icon.png' md5='80a7318cc454eb11315abd88f11fb7f4'"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/index.page:17
+msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:20
+msgid "Scanning Pages"
+msgstr "掃描頁面"
+
+#. (itstool) path: section/title
+#: C/index.page:24
+msgid "Modifying the Document"
+msgstr "修改文年"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Using the Document"
+msgstr "使用文件"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Simple Scan Shortcuts"
+msgstr ""
+
 #. (itstool) path: p/link
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
diff --git a/help/zh_TW/zh_TW.stamp b/help/zh_TW/zh_TW.stamp
deleted file mode 100644
index e69de29..0000000
--- a/help/zh_TW/zh_TW.stamp
+++ /dev/null
diff --git a/install-sh b/install-sh
deleted file mode 100755
index 59990a1..0000000
--- a/install-sh
+++ /dev/null
@@ -1,508 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2014-09-12.12; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# 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
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-tab='	'
-nl='
-'
-IFS=" $tab$nl"
-
-# Set DOITPROG to "echo" to test this script.
-
-doit=${DOITPROG-}
-doit_exec=${doit:-exec}
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-is_target_a_directory=possibly
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-        case $mode in
-          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
-            echo "$0: invalid mode: $mode" >&2
-            exit 1;;
-        esac
-        shift;;
-
-    -o) chowncmd="$chownprog $2"
-        shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t)
-        is_target_a_directory=always
-        dst_arg=$2
-        # Protect names problematic for 'test' and other utilities.
-        case $dst_arg in
-          -* | [=\(\)!]) dst_arg=./$dst_arg;;
-        esac
-        shift;;
-
-    -T) is_target_a_directory=never;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --) shift
-        break;;
-
-    -*) echo "$0: invalid option: $1" >&2
-        exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-# We allow the use of options -d and -T together, by making -d
-# take the precedence; this is for compatibility with GNU install.
-
-if test -n "$dir_arg"; then
-  if test -n "$dst_arg"; then
-    echo "$0: target directory not allowed when installing a directory." >&2
-    exit 1
-  fi
-fi
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call 'install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  if test $# -gt 1 || test "$is_target_a_directory" = always; then
-    if test ! -d "$dst_arg"; then
-      echo "$0: $dst_arg: Is not a directory." >&2
-      exit 1
-    fi
-  fi
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-        u_plus_rw=
-      else
-        u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-        u_plus_rw=
-      else
-        u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names problematic for 'test' and other utilities.
-  case $src in
-    -* | [=\(\)!]) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test "$is_target_a_directory" = never; then
-        echo "$0: $dst_arg: Is a directory" >&2
-        exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      dstdir=`dirname "$dst"`
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-        # Create intermediate dirs using mode 755 as modified by the umask.
-        # This is like FreeBSD 'install' as of 1997-10-28.
-        umask=`umask`
-        case $stripcmd.$umask in
-          # Optimize common cases.
-          *[2367][2367]) mkdir_umask=$umask;;
-          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-          *[0-7])
-            mkdir_umask=`expr $umask + 22 \
-              - $umask % 100 % 40 + $umask % 20 \
-              - $umask % 10 % 4 + $umask % 2
-            `;;
-          *) mkdir_umask=$umask,go-w;;
-        esac
-
-        # With -d, create the new directory with the user-specified mode.
-        # Otherwise, rely on $mkdir_umask.
-        if test -n "$dir_arg"; then
-          mkdir_mode=-m$mode
-        else
-          mkdir_mode=
-        fi
-
-        posix_mkdir=false
-        case $umask in
-          *[123567][0-7][0-7])
-            # POSIX mkdir -p sets u+wx bits regardless of umask, which
-            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-            ;;
-          *)
-            # $RANDOM is not portable (e.g. dash);  use it when possible to
-            # lower collision chance
-            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
-            # create the $tmpdir first (and fail if unsuccessful) to make sure
-            # that nobody tries to guess the $tmpdir name.
-            if (umask $mkdir_umask &&
-                $mkdirprog $mkdir_mode "$tmpdir" &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
-            then
-              if test -z "$dir_arg" || {
-                   # Check for POSIX incompatibilities with -m.
-                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                   # other-writable bit of parent directory when it shouldn't.
-                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   test_tmpdir="$tmpdir/a"
-                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
-                   case $ls_ld_tmpdir in
-                     d????-?r-*) different_mode=700;;
-                     d????-?--*) different_mode=755;;
-                     *) false;;
-                   esac &&
-                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
-                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                   }
-                 }
-              then posix_mkdir=:
-              fi
-              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
-            else
-              # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
-            fi
-            trap '' 0;;
-        esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-        umask $mkdir_umask &&
-        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-        /*) prefix='/';;
-        [-=\(\)!]*) prefix='./';;
-        *)  prefix='';;
-      esac
-
-      oIFS=$IFS
-      IFS=/
-      set -f
-      set fnord $dstdir
-      shift
-      set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-        test X"$d" = X && continue
-
-        prefix=$prefix$d
-        if test -d "$prefix"; then
-          prefixes=
-        else
-          if $posix_mkdir; then
-            (umask=$mkdir_umask &&
-             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-            # Don't fail if two instances are running concurrently.
-            test -d "$prefix" || exit 1
-          else
-            case $prefix in
-              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-              *) qprefix=$prefix;;
-            esac
-            prefixes="$prefixes '$qprefix'"
-          fi
-        fi
-        prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-        # Don't fail if two instances are running concurrently.
-        (umask $mkdir_umask &&
-         eval "\$doit_exec \$mkdirprog $prefixes") ||
-          test -d "$dstdir" || exit 1
-        obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
-       set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       set +f &&
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-        # Now remove or move aside any old file at destination location.
-        # We try this two ways since rm can't unlink itself on some
-        # systems and the destination file might be busy for other
-        # reasons.  In this case, the final cleanup might fail but the new
-        # file should still install successfully.
-        {
-          test ! -f "$dst" ||
-          $doit $rmcmd -f "$dst" 2>/dev/null ||
-          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-          } ||
-          { echo "$0: cannot unlink or rename $dst" >&2
-            (exit 1); exit 1
-          }
-        } &&
-
-        # Now rename the file to the real destination.
-        $doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/m4/appstream-xml.m4 b/m4/appstream-xml.m4
deleted file mode 100644
index f7e21b9..0000000
--- a/m4/appstream-xml.m4
+++ /dev/null
@@ -1,86 +0,0 @@
-# appstream-xml.m4
-#
-# serial 6
-
-dnl APPSTREAM_XML
-dnl Installs and validates AppData XML files.
-dnl
-dnl Call APPSTREAM_XML in configure.ac to check for the appstream-util tool.
-dnl Add @APPSTREAM_XML_RULES@ to a Makefile.am to substitute the make rules. Add
-dnl .appdata.xml files to appstream_XML in Makefile.am and they will be validated
-dnl at make check time, if appstream-util is installed, as well as installed
-dnl to the correct location automatically. Add --enable-appstream-util to
-dnl AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when
-dnl doing a distcheck.
-dnl
-dnl Adding files to appstream_XML does not distribute them automatically.
-
-AC_DEFUN([APPSTREAM_XML],
-[
-  m4_pattern_allow([AM_V_GEN])
-  AC_ARG_ENABLE([appstream-util],
-                [AS_HELP_STRING([--disable-appstream-util],
-                                [Disable validating AppData XML files during check phase])])
-
-  AS_IF([test "x$enable_appstream_validate" != "xno"],
-        [AC_PATH_PROG([APPSTREAM_UTIL], [appstream-util])
-         AS_IF([test "x$APPSTREAM_UTIL" = "x"],
-               [have_appstream_validate=no],
-               [have_appstream_validate=yes
-                AC_SUBST([APPSTREAM_UTIL])])],
-        [have_appstream_validate=no])
-
-  AS_IF([test "x$have_appstream_validate" != "xno"],
-        [appstream_validate=yes],
-        [appstream_validate=no
-         AS_IF([test "x$enable_appstream_validate" = "xyes"],
-               [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])])
-
-  AC_SUBST([appstreamxmldir], [${datadir}/appdata])
-
-  APPSTREAM_XML_RULES='
-.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml
-
-mostlyclean-am: clean-appstream-xml
-
-%.appdata.valid: %.appdata.xml
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \
-		if test -n "$(APPSTREAM_UTIL)"; \
-			then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \
-		&& touch [$]@
-
-check-am: $(appstream_XML:.appdata.xml=.appdata.valid)
-uninstall-am: uninstall-appstream-xml
-install-data-am: install-appstream-xml
-
-.SECONDARY: $(appstream_XML)
-
-install-appstream-xml: $(appstream_XML)
-	@$(NORMAL_INSTALL)
-	if test -n "$^"; then \
-		test -z "$(appstreamxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appstreamxmldir)"; \
-		$(INSTALL_DATA) $^ "$(DESTDIR)$(appstreamxmldir)"; \
-	fi
-
-uninstall-appstream-xml:
-	@$(NORMAL_UNINSTALL)
-	@list='\''$(appstream_XML)'\''; test -n "$(appstreamxmldir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '\''$(DESTDIR)$(appstreamxmldir)'\'' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appstreamxmldir)" && rm -f $$files
-
-clean-appstream-xml:
-	rm -f $(appstream_XML:.appdata.xml=.appdata.valid)
-'
-  _APPSTREAM_XML_SUBST(APPSTREAM_XML_RULES)
-])
-
-dnl _APPSTREAM_XML_SUBST(VARIABLE)
-dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-AC_DEFUN([_APPSTREAM_XML_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
diff --git a/m4/gettext.m4 b/m4/gettext.m4
deleted file mode 100644
index eef5073..0000000
--- a/m4/gettext.m4
+++ /dev/null
@@ -1,420 +0,0 @@
-# gettext.m4 serial 68 (gettext-0.19.8)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value '$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
-    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define([gt_included_intl],
-    ifelse([$1], [external],
-      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
-      [yes]))
-  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED([$2])
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AC_REQUIRE([AM_NLS])
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH([included-gettext],
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-               ]],
-               [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-               ]])],
-            [eval "$gt_func_gnugettext_libc=yes"],
-            [eval "$gt_func_gnugettext_libc=no"])])
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            [$gt_func_gnugettext_libintl],
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_LINK_IFELSE(
-              [AC_LANG_PROGRAM(
-                 [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                 ]],
-                 [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                 ]])],
-              [eval "$gt_func_gnugettext_libintl=yes"],
-              [eval "$gt_func_gnugettext_libintl=no"])
-            dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_LINK_IFELSE(
-                [AC_LANG_PROGRAM(
-                   [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                   ]],
-                   [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                   ]])],
-                [LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
-                ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE([ENABLE_NLS], [1],
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE([HAVE_GETTEXT], [1],
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE([HAVE_DCGETTEXT], [1],
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST([BUILD_INCLUDED_LIBINTL])
-    AC_SUBST([USE_INCLUDED_LIBINTL])
-    AC_SUBST([CATOBJEXT])
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST([DATADIRNAME])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST([INSTOBJEXT])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST([GENCAT])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INTLOBJS=
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST([INTLOBJS])
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST([INTLLIBS])
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST([LIBINTL])
-  AC_SUBST([LTLIBINTL])
-  AC_SUBST([POSUB])
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
-  m4_divert_text([DEFAULTS], [gt_needs=])
-  m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
-  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-
-dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
diff --git a/m4/gsettings.m4 b/m4/gsettings.m4
deleted file mode 100644
index 35ee5aa..0000000
--- a/m4/gsettings.m4
+++ /dev/null
@@ -1,83 +0,0 @@
-dnl GLIB_GSETTINGS
-dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
-dnl the schema should be compiled
-dnl
-
-AC_DEFUN([GLIB_GSETTINGS],
-[
-  m4_pattern_allow([AM_V_GEN])
-  AC_ARG_ENABLE(schemas-compile,
-                AS_HELP_STRING([--disable-schemas-compile],
-                               [Disable regeneration of gschemas.compiled on install]),
-                [case ${enableval} in
-                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
-                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
-                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
-                 esac])
-  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
-  PKG_PROG_PKG_CONFIG([0.16])
-  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
-  if test x$cross_compiling != xyes; then
-    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
-  else
-    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
-  fi
-  AC_SUBST(GLIB_COMPILE_SCHEMAS)
-  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
-    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
-  else
-    ifelse([$1],,[:],[$1])
-  fi
-
-  GSETTINGS_RULES='
-.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
-
-mostlyclean-am: clean-gsettings-schemas
-
-gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
-
-%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@
-
-all-am: $(gsettings_SCHEMAS:.xml=.valid)
-uninstall-am: uninstall-gsettings-schemas
-install-data-am: install-gsettings-schemas
-
-.SECONDARY: $(gsettings_SCHEMAS)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
-	@$(NORMAL_INSTALL)
-	if test -n "$^"; then \
-		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
-		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
-		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
-	fi
-
-uninstall-gsettings-schemas:
-	@$(NORMAL_UNINSTALL)
-	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-
-clean-gsettings-schemas:
-	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-ifdef gsettings_ENUM_NAMESPACE
-$(gsettings__enum_file): $(gsettings_ENUM_FILES)
-	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
-endif
-'
-  _GSETTINGS_SUBST(GSETTINGS_RULES)
-])
-
-dnl _GSETTINGS_SUBST(VARIABLE)
-dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-AC_DEFUN([_GSETTINGS_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
diff --git a/m4/iconv.m4 b/m4/iconv.m4
deleted file mode 100644
index aa159c5..0000000
--- a/m4/iconv.m4
+++ /dev/null
@@ -1,271 +0,0 @@
-# iconv.m4 serial 19 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[
-#include <stdlib.h>
-#include <iconv.h>
-         ]],
-         [[iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);]])],
-      [am_cv_func_iconv=yes])
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-           ]],
-           [[iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);]])],
-        [am_cv_lib_iconv=yes]
-        [am_cv_func_iconv=yes])
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
-      dnl Solaris 10.
-      am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      am_cv_func_iconv_works=no
-      for ac_iconv_const in '' 'const'; do
-        AC_RUN_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <iconv.h>
-#include <string.h>
-
-#ifndef ICONV_CONST
-# define ICONV_CONST $ac_iconv_const
-#endif
-             ]],
-             [[int result = 0;
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\263";
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
-  return result;
-]])],
-          [am_cv_func_iconv_works=yes], ,
-          [case "$host_os" in
-             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-             *)            am_cv_func_iconv_works="guessing yes" ;;
-           esac])
-        test "$am_cv_func_iconv_works" = no || break
-      done
-      LIBS="$am_save_LIBS"
-    ])
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-    AC_DEFINE([HAVE_ICONV], [1],
-      [Define if you have the iconv() function and it works.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST([LIBICONV])
-  AC_SUBST([LTLIBICONV])
-])
-
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
-m4_define([gl_iconv_AC_DEFUN],
-  m4_version_prereq([2.64],
-    [[AC_DEFUN_ONCE(
-        [$1], [$2])]],
-    [m4_ifdef([gl_00GNULIB],
-       [[AC_DEFUN_ONCE(
-           [$1], [$2])]],
-       [[AC_DEFUN(
-           [$1], [$2])]])]))
-gl_iconv_AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-           ]],
-           [[]])],
-        [am_cv_proto_iconv_arg1=""],
-        [am_cv_proto_iconv_arg1="const"])
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([
-         $am_cv_proto_iconv])
-    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
-      [Define as const if the declaration of iconv() needs const.])
-    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
-    m4_ifdef([gl_ICONV_H_DEFAULTS],
-      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
-       if test -n "$am_cv_proto_iconv_arg1"; then
-         ICONV_CONST="const"
-       fi
-      ])
-  fi
-])
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
deleted file mode 100644
index aca924c..0000000
--- a/m4/intlmacosx.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-# intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on Mac OS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in Mac OS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    [gt_cv_func_CFPreferencesCopyAppValue],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFPreferences.h>]],
-          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
-      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Check for API introduced in Mac OS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFLocale.h>]],
-          [[CFLocaleCopyCurrent();]])],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
-      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
deleted file mode 100644
index 6209de6..0000000
--- a/m4/lib-ld.m4
+++ /dev/null
@@ -1,119 +0,0 @@
-# lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
-
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-2.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-        [assume the C compiler uses GNU ld [default=no]])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL([acl_cv_path_LD],
-[if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
-      *)
-        test "$with_gnu_ld" != yes && break
-        ;;
-      esac
-    fi
-  done
-  IFS="$acl_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT([$LD])
-else
-  AC_MSG_RESULT([no])
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
deleted file mode 100644
index 2f51855..0000000
--- a/m4/lib-link.m4
+++ /dev/null
@@ -1,777 +0,0 @@
-# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.54])
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. The missing-message
-dnl defaults to 'no' and may contain additional hints for the user.
-dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
-dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
-    dnl because these -l options might require -L options that are present in
-    dnl LIBS. -l options benefit only from the -L options listed before it.
-    dnl Otherwise, add it to the front of LIBS, because it may be a static
-    dnl library that depends on another static library that is present in LIBS.
-    dnl Static libraries benefit only from the static libraries listed after
-    dnl it.
-    case " $LIB[]NAME" in
-      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
-      *)       LIBS="$LIB[]NAME $LIBS" ;;
-    esac
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([[$3]], [[$4]])],
-      [ac_cv_lib[]Name=yes],
-      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-    LIB[]NAME[]_PREFIX=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl   acl_libext,
-dnl   acl_shlibext,
-dnl   acl_libname_spec,
-dnl   acl_library_names_spec,
-dnl   acl_hardcode_libdir_flag_spec,
-dnl   acl_hardcode_libdir_separator,
-dnl   acl_hardcode_direct,
-dnl   acl_hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE([rpath],
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_FROMPACKAGE(name, package)
-dnl declares that libname comes from the given package. The configure file
-dnl will then not have a --with-libname-prefix option but a
-dnl --with-package-prefix option. Several libraries can come from the same
-dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
-dnl macro call that searches for libname.
-AC_DEFUN([AC_LIB_FROMPACKAGE],
-[
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_frompackage_]NAME, [$2])
-  popdef([NAME])
-  pushdef([PACK],[$2])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
-  popdef([PACKUP])
-  popdef([PACK])
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
-  dnl Autoconf >= 2.61 supports dots in --with options.
-  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH(P_A_C_K[-prefix],
-[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
-  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  LIB[]NAME[]_PREFIX=
-  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
-  dnl computed. So it has to be reset here.
-  HAVE_LIB[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-            dnl The same code as in the loop below:
-            dnl First look for a shared library.
-            if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-            dnl Then look for a static library.
-            if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  dnl First look for a shared library.
-                  if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                  dnl Then look for a static library.
-                  if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$acl_hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-  popdef([P_A_C_K])
-  popdef([PACKLIBS])
-  popdef([PACKUP])
-  popdef([PACK])
-  popdef([NAME])
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
-
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
-[
-  AC_REQUIRE([AC_LIB_RPATH])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  $1=
-  if test "$enable_rpath" != no; then
-    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-      dnl Use an explicit option to hardcode directories into the resulting
-      dnl binary.
-      rpathdirs=
-      next=
-      for opt in $2; do
-        if test -n "$next"; then
-          dir="$next"
-          dnl No need to hardcode the standard /usr/lib.
-          if test "X$dir" != "X/usr/$acl_libdirstem" \
-             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
-            rpathdirs="$rpathdirs $dir"
-          fi
-          next=
-        else
-          case $opt in
-            -L) next=yes ;;
-            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
-                 dnl No need to hardcode the standard /usr/lib.
-                 if test "X$dir" != "X/usr/$acl_libdirstem" \
-                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
-                   rpathdirs="$rpathdirs $dir"
-                 fi
-                 next= ;;
-            *) next= ;;
-          esac
-        fi
-      done
-      if test "X$rpathdirs" != "X"; then
-        if test -n ""$3""; then
-          dnl libtool is used for linking. Use -R options.
-          for dir in $rpathdirs; do
-            $1="${$1}${$1:+ }-R$dir"
-          done
-        else
-          dnl The linker is used for linking directly.
-          if test -n "$acl_hardcode_libdir_separator"; then
-            dnl Weird platform: only the last -rpath option counts, the user
-            dnl must pass all path elements in one option.
-            alldirs=
-            for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
-            done
-            acl_save_libdir="$libdir"
-            libdir="$alldirs"
-            eval flag=\"$acl_hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
-            $1="$flag"
-          else
-            dnl The -rpath options are cumulative.
-            for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
-              libdir="$dir"
-              eval flag=\"$acl_hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
-              $1="${$1}${$1:+ }$flag"
-            done
-          fi
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST([$1])
-])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
deleted file mode 100644
index 6851031..0000000
--- a/m4/lib-prefix.m4
+++ /dev/null
@@ -1,224 +0,0 @@
-# lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_PREPARE_MULTILIB creates
-dnl - a variable acl_libdirstem, containing the basename of the libdir, either
-dnl   "lib" or "lib64" or "lib/64",
-dnl - a variable acl_libdirstem2, as a secondary possible value for
-dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
-dnl   "lib/amd64".
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
-  dnl There is no formal standard regarding lib and lib64.
-  dnl On glibc systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
-  dnl the compiler's default mode by looking at the compiler's library search
-  dnl path. If at least one of its elements ends in /lib64 or points to a
-  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
-  dnl Otherwise we use the default, namely "lib".
-  dnl On Solaris systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
-  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
-      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
-      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
-      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
-      dnl symlink is missing, so we set acl_libdirstem2 too.
-      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
-        [AC_EGREP_CPP([sixtyfour bits], [
-#ifdef _LP64
-sixtyfour bits
-#endif
-           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
-        ])
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-        esac
-      fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-])
diff --git a/m4/nls.m4 b/m4/nls.m4
deleted file mode 100644
index afdb9ca..0000000
--- a/m4/nls.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
-dnl Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
diff --git a/m4/pkg.m4 b/m4/pkg.m4
deleted file mode 100644
index 82bea96..0000000
--- a/m4/pkg.m4
+++ /dev/null
@@ -1,275 +0,0 @@
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
-dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl As a special exception to the GNU General Public License, if you
-dnl distribute this file as part of a program that contains a
-dnl configuration script generated by Autoconf, you may include it under
-dnl the same distribution terms that you use for the rest of that
-dnl program.
-
-dnl PKG_PREREQ(MIN-VERSION)
-dnl -----------------------
-dnl Since: 0.29
-dnl
-dnl Verify that the version of the pkg-config macros are at least
-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-dnl installed version of pkg-config, this checks the developer's version
-dnl of pkg.m4 when generating configure.
-dnl
-dnl To ensure that this macro is defined, also add:
-dnl m4_ifndef([PKG_PREREQ],
-dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-dnl
-dnl See the "Since" comment for each macro you use to see what version
-dnl of the macros you require.
-m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
-m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-])dnl PKG_PREREQ
-
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
-dnl Since: 0.16
-dnl
-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-dnl first found in the path. Checks that the version of pkg-config found
-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-dnl used since that's the first version where most current features of
-dnl pkg-config existed.
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])dnl PKG_PROG_PKG_CONFIG
-
-dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------------------------------
-dnl Since: 0.18
-dnl
-dnl Check to see whether a particular set of modules exists. Similar to
-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-dnl
-dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
-dnl it's called might be skipped (such as if it is within an "if", you
-dnl have to call PKG_CHECK_EXISTS manually
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-dnl ---------------------------------------------
-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-dnl pkg_failed based on the result.
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])dnl _PKG_CONFIG
-
-dnl _PKG_SHORT_ERRORS_SUPPORTED
-dnl ---------------------------
-dnl Internal check to see if pkg-config supports short errors.
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])dnl _PKG_SHORT_ERRORS_SUPPORTED
-
-
-dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl --------------------------------------------------------------
-dnl Since: 0.4.0
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])dnl PKG_CHECK_MODULES
-
-
-dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl ---------------------------------------------------------------------
-dnl Since: 0.29
-dnl
-dnl Checks for existence of MODULES and gathers its build flags with
-dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-dnl and VARIABLE-PREFIX_LIBS from --libs.
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-dnl configure.ac.
-AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-_save_PKG_CONFIG=$PKG_CONFIG
-PKG_CONFIG="$PKG_CONFIG --static"
-PKG_CHECK_MODULES($@)
-PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-])dnl PKG_CHECK_MODULES_STATIC
-
-
-dnl PKG_INSTALLDIR([DIRECTORY])
-dnl -------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable pkgconfigdir as the location where a module
-dnl should install pkg-config .pc files. By default the directory is
-dnl $libdir/pkgconfig, but the default can be changed by passing
-dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-dnl parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_INSTALLDIR
-
-
-dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-dnl --------------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-dnl module should install arch-independent pkg-config .pc files. By
-dnl default the directory is $datadir/pkgconfig, but the default can be
-dnl changed by passing DIRECTORY. The user can override through the
-dnl --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_NOARCH_INSTALLDIR
-
-
-dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------
-dnl Since: 0.28
-dnl
-dnl Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])dnl PKG_CHECK_VAR
diff --git a/m4/po.m4 b/m4/po.m4
deleted file mode 100644
index c5a2f6b..0000000
--- a/m4/po.m4
+++ /dev/null
@@ -1,453 +0,0 @@
-# po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  AC_REQUIRE([AC_PROG_SED])dnl
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Release version of the gettext macros. This is used to ensure that
-  dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-
-  dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([MSGFMT_015])
-changequote(,)dnl
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([GMSGFMT_015])
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
-  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([XGETTEXT_015])
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
-  dnl Installation directories.
-  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
-  dnl have to define it here, so that it can be used in po/Makefile.
-  test -n "$localedir" || localedir='${datadir}/locale'
-  AC_SUBST([localedir])
-
-  dnl Support for AM_XGETTEXT_OPTION.
-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
-  AC_CONFIG_COMMANDS([po-directories], [[
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done]],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake < 1.5.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
-
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  tab=`printf '\t'`
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
-  # Seen the first line of the variable definition.
-  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
-
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
-    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Hide the ALL_LINGUAS assignment from automake < 1.5.
-  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      fi
-      for desiredlang in $desiredlanguages; do
-        # Use the presentlang catalog if desiredlang is
-        #   a. equal to presentlang, or
-        #   b. a variant of presentlang (because in this case,
-        #      presentlang can be used as a fallback for messages
-        #      which are not translated in the desiredlang catalog).
-        case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
-
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  tab=`printf '\t'`
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-])
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
-  XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
-  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
diff --git a/m4/progtest.m4 b/m4/progtest.m4
deleted file mode 100644
index 9ace7c3..0000000
--- a/m4/progtest.m4
+++ /dev/null
@@ -1,91 +0,0 @@
-# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ([2.50])
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL([ac_cv_path_$1],
-[case "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-    ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$][$1])
-else
-  AC_MSG_RESULT([no])
-fi
-AC_SUBST([$1])dnl
-])
diff --git a/m4/yelp.m4 b/m4/yelp.m4
deleted file mode 100644
index 709c48e..0000000
--- a/m4/yelp.m4
+++ /dev/null
@@ -1,219 +0,0 @@
-AC_DEFUN([YELP_HELP_INIT],
-[
-AC_REQUIRE([AC_PROG_LN_S])
-m4_pattern_allow([AM_V_at])
-m4_pattern_allow([AM_V_GEN])
-m4_pattern_allow([AM_DEFAULT_VERBOSITY])
-
-YELP_LC_MEDIA_LINKS=true
-YELP_LC_DIST=true
-
-for yelpopt in [$1]; do
-  case $yelpopt in
-    lc-media-links)    YELP_LC_MEDIA_LINKS=true ;;
-    no-lc-media-links) YELP_LC_MEDIA_LINKS= ;;
-    lc-dist)           YELP_LC_DIST=true ;;
-    no-lc-dist)        YELP_LC_DIST= ;;
-    *) AC_MSG_ERROR([Unrecognized [YELP_HELP_INIT] option $yelpopt"]) ;;
-  esac
-done;
-AC_SUBST([YELP_LC_MEDIA_LINKS])
-AC_SUBST([YELP_LC_DIST])
-
-AC_ARG_WITH([help-dir],
-            AS_HELP_STRING([--with-help-dir=DIR],
-                           [path where help files are installed]),,
-            [with_help_dir='${datadir}/help'])
-HELP_DIR="$with_help_dir"
-AC_SUBST(HELP_DIR)
-
-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
-if test x"$ITSTOOL" = x; then
-  AC_MSG_ERROR([itstool not found])
-fi
-
-AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
-AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
-if test x"$XMLLINT" = x; then
-  AC_MSG_ERROR([xmllint not found])
-fi
-
-YELP_HELP_RULES='
-HELP_ID ?=
-HELP_POT ?=
-HELP_FILES ?=
-HELP_EXTRA ?=
-HELP_MEDIA ?=
-HELP_LINGUAS ?=
-
-_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS))
-_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot))
-_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po))
-_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES))
-_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f))
-_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f))
-_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f))
-_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f)))
-_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp)
-
-_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
-_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V))
-_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V))
-_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V))
-_HELP_LC_VERBOSE_0 = @echo "  GEN    "$(dir [$]@);
-
-all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES)
-
-.PHONY: pot
-pot: $(_HELP_POTFILE)
-$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-	$(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
-	$(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
-
-.PHONY: repo
-repo: $(_HELP_POTFILE)
-	$(AM_V_at)for po in $(_HELP_POFILES); do \
-	  if test "x[$](_HELP_V)" = "x0"; then echo "  GEN    $${po}"; fi; \
-	  msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \
-	done
-
-$(_HELP_POFILES):
-	$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
-	$(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi
-	$(AM_V_GEN)if ! test -f "[$]@"; then \
-	  (cd "$(dir [$]@)" && \
-	    $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \
-	    mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \
-	else \
-	  (cd "$(dir [$]@)" && \
-	    $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \
-	    msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \
-	    rm "$(notdir [$]@).tmp"); \
-	fi
-
-$(_HELP_MOFILES): %.mo: %.po
-	$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
-	$(AM_V_GEN)msgfmt -o "[$]@" "$<"
-
-$(_HELP_LC_FILES): $(_HELP_LINGUAS)
-$(_HELP_LINGUAS): $(_HELP_LC_STAMPS)
-$(_HELP_LC_STAMPS): %.stamp: %.mo
-$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA)
-	$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
-	$(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \
-	mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \
-	if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \
-	(cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \
-	touch "[$]@"
-
-.PHONY: clean-help
-mostlyclean-am: $(if $(HELP_ID),clean-help)
-clean-help:
-	rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES)
-
-EXTRA_DIST ?=
-EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp))
-EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
-EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
-
-distdir: distdir-help-files
-distdir-help-files: $(_HELP_LC_FILES)
-	@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
-	  $(MKDIR_P) "$(distdir)/$$lc"; \
-	  for file in $(HELP_FILES); do \
-	    if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
-	    cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \
-	  done; \
-	done; \
-
-.PHONY: check-help
-check: check-help
-check-help:
-	for lc in C $(_HELP_LINGUAS); do \
-	  if test -d "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  for page in $(HELP_FILES); do \
-	    echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
-	    $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
-	  done; \
-	done
-
-
-.PHONY: install-help
-install-data-am: $(if $(HELP_ID),install-help)
-install-help: $(_HELP_LC_FILES)
-	@for lc in C $(_HELP_LINGUAS); do \
-	  $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
-	done
-	@for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
-	  if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
-	  echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \
-	  $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \
-	done; done
-	@for f in $(_HELP_C_EXTRA); do \
-	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
-	  if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
-	  echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \
-	  $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \
-	done
-	@for f in $(HELP_MEDIA); do \
-	  for lc in C $(_HELP_LINGUAS); do \
-	    if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \
-	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	    mdir=`dirname "$$f"`; \
-	    if test "x$mdir" = "x."; then mdir=""; fi; \
-	    if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \
-	    if test -f "$$d$$lc/$$f"; then \
-	      echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
-	      $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
-	    elif test "x$$lc" != "xC"; then \
-	      if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
-	        echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
-	        dname="$$f"; \
-	        pars="../"; \
-	        while test "$$dname" != "." -a "$$dname" != "/"; do \
-	          pars="../$$pars"; \
-	          dname=$$(dirname "$$dname"); \
-	        done; \
-	        $(LN_S) -f $$pars"C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
-	      fi; \
-	    fi; \
-	  done; \
-	done
-
-.PHONY: uninstall-help
-uninstall-am: $(if $(HELP_ID),uninstall-help)
-uninstall-help:
-	for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  echo "rm -f $$helpdir`basename $$f`"; \
-	  rm -f "$$helpdir`basename $$f`"; \
-	done; done
-	@for f in $(_HELP_C_EXTRA); do \
-	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  echo "rm -f $$helpdir`basename $$f`"; \
-	  rm -f "$$helpdir`basename $$f`"; \
-	done
-	@for f in $(HELP_MEDIA); do \
-	  for lc in C $(_HELP_LINGUAS); do \
-	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	    echo "rm -f $$helpdir$$f"; \
-	    rm -f "$$helpdir$$f"; \
-	  done; \
-	done;
-'
-AC_SUBST([YELP_HELP_RULES])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
-])
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..178001b
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,39 @@
+project ('simple-scan', ['vala', 'c'],
+         version: '3.26.2',
+         license: 'GPLv3+',
+         default_options: [
+             'warning_level=1',
+             'buildtype=debugoptimized',
+         ],
+         meson_version: '>= 0.37.1')
+
+gnome = import ('gnome')
+i18n = import ('i18n')
+
+# Paths
+mandir = join_paths (get_option ('prefix'), get_option ('mandir'))
+localedir = join_paths (get_option ('prefix'), get_option ('localedir'))
+datadir = join_paths (get_option ('prefix'), get_option ('datadir'))
+icondir = join_paths (datadir, 'simple-scan', 'icons')
+
+# Dependencies
+glib_dep = dependency ('glib-2.0', version: '>= 2.38')
+gtk_dep = dependency ('gtk+-3.0', version: '>=3.12')
+gmodule_dep = dependency ('gmodule-export-2.0')
+gthread_dep = dependency ('gthread-2.0')
+zlib_dep = dependency ('zlib')
+cairo_dep = dependency ('cairo')
+gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0')
+gusb_dep = dependency ('gusb', version: '>= 0.2.7')
+colord_dep = dependency ('colord', required: false)
+packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false)
+webp_dep = dependency ('libwebp', required: false)
+webpmux_dep = dependency ('libwebpmux', required: false)
+sane_dep = dependency ('sane-backends')
+msgfmt = find_program  ('msgfmt')
+itstool = find_program  ('itstool')
+
+subdir ('po')
+subdir ('data')
+subdir ('help')
+subdir ('src')
diff --git a/missing b/missing
deleted file mode 100755
index f62bbae..0000000
--- a/missing
+++ /dev/null
@@ -1,215 +0,0 @@
-#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
-
-scriptversion=2013-10-28.13; # UTC
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-case $1 in
-
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
-
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-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
-
-Supported PROGRAM values:
-  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.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# 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
-
-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 'autom4te' 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/>"
-    ;;
-    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)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/po/LINGUAS b/po/LINGUAS
index 8dd4768..4a555bf 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -17,9 +17,10 @@ eo
 es
 et
 eu
+fa
 fi
-fr_CA
 fr
+fur
 gd
 gl
 he
@@ -40,6 +41,7 @@ mhr
 ms
 my
 nb
+ne
 nl
 oc
 pa
@@ -55,6 +57,7 @@ sk
 sl
 sq
 sr
+sr@latin
 sv
 ta
 te
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index 8f34f00..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,483 +0,0 @@
-# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# 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 any warranty.
-#
-# Origin: gettext-0.19.7
-GETTEXT_MACRO_VERSION = 0.19
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-SED = @SED@
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
-datadir = @datadir@
-localedir = @localedir@
-gettextsrcdir = $(datadir)/gettext/po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-# We use $(mkdir_p).
-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# @install_sh@ does not start with $(SHELL), so we add it.
-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
-# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) @install_sh@ -d
-install_sh = $(SHELL) @install_sh@
-MKDIR_P = @MKDIR_P@
-mkdir_p = @mkdir_p@
-
-# When building gettext-tools, we prefer to use the built programs
-# rather than installed programs.  However, we can't do that when we
-# are cross compiling.
-CROSS_COMPILING = @CROSS_COMPILING@
-
-GMSGFMT_ = @GMSGFMT@
-GMSGFMT_no = @GMSGFMT@
-GMSGFMT_yes = @GMSGFMT_015@
-GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-XGETTEXT_ = @XGETTEXT@
-XGETTEXT_no = @XGETTEXT@
-XGETTEXT_yes = @XGETTEXT_015@
-XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
-MSGMERGE_UPDATE = @MSGMERGE@ --update
-MSGINIT = msginit
-MSGCONV = msgconv
-MSGFILTER = msgfilter
-
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-UPDATEPOFILES = @UPDATEPOFILES@
-DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in remove-potcdate.sin \
-$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
-$(POFILES) $(GMOFILES) \
-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-
-POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
-POFILESDEPS_yes = $(POFILESDEPS_)
-POFILESDEPS_no =
-POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
-
-DISTFILESDEPS_ = update-po
-DISTFILESDEPS_yes = $(DISTFILESDEPS_)
-DISTFILESDEPS_no =
-DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
-
-# Makevars gets inserted here. (Don't remove this line!)
-
-.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
-.po.gmo:
-	@lang=`echo $* | sed -e 's,.*/,,'`; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
-	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
-.sin.sed:
-	sed -e '/^#/d' $< > t-$@
-	mv t-$@ $@
-
-
-all: all-@USE_NLS@
-
-all-yes: stamp-po
-all-no:
-
-# Ensure that the gettext macros and this Makefile.in.in are in sync.
-CHECK_MACRO_VERSION = \
-	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
-	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
-	       exit 1; \
-	     }
-
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
-# we don't want to bother translators with empty POT files). We assume that
-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
-	@$(CHECK_MACRO_VERSION)
-	test ! -f $(srcdir)/$(DOMAIN).pot || \
-	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
-	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
-	  echo "touch stamp-po" && \
-	  echo timestamp > stamp-poT && \
-	  mv stamp-poT stamp-po; \
-	}
-
-# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
-# otherwise packages like GCC can not be built if only parts of the source
-# have been downloaded.
-
-# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-# The determination of whether the package xyz is a GNU one is based on the
-# heuristic whether some file in the top level directory mentions "GNU xyz".
-# If GNU 'find' is available, we avoid grepping through monster files.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	package_gnu="$(PACKAGE_GNU)"; \
-	test -n "$$package_gnu" || { \
-	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
-		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
-			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
-			       /dev/null '{}' ';' 2>/dev/null; \
-	       else \
-		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
-	       fi; \
-	     } | grep -v 'libtool:' >/dev/null; then \
-	     package_gnu=yes; \
-	   else \
-	     package_gnu=no; \
-	   fi; \
-	}; \
-	if test "$$package_gnu" = "yes"; then \
-	  package_prefix='GNU '; \
-	else \
-	  package_prefix=''; \
-	fi; \
-	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
-	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
-	else \
-	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
-	fi; \
-	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
-	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
-	      --files-from=$(srcdir)/POTFILES.in \
-	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	      --msgid-bugs-address="$$msgid_bugs_address" \
-	    ;; \
-	  *) \
-	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
-	      --files-from=$(srcdir)/POTFILES.in \
-	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	      --package-name="$${package_prefix}@PACKAGE@" \
-	      --package-version='@VERSION@' \
-	      --msgid-bugs-address="$$msgid_bugs_address" \
-	    ;; \
-	esac
-	test ! -f $(DOMAIN).po || { \
-	  if test -f $(srcdir)/$(DOMAIN).pot-header; then \
-	    sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
-	    cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
-	    rm -f $(DOMAIN).1po; \
-	  fi; \
-	  if test -f $(srcdir)/$(DOMAIN).pot; then \
-	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-	    else \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	    fi; \
-	  else \
-	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	  fi; \
-	}
-
-# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
-# every "make" invocation, only create it when it is missing.
-# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
-$(srcdir)/$(DOMAIN).pot:
-	$(MAKE) $(DOMAIN).pot-update
-
-# This target rebuilds a PO file if $(DOMAIN).pot has changed.
-# Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(POFILESDEPS)
-	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-	if test -f "$(srcdir)/$${lang}.po"; then \
-	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
-	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
-	  cd $(srcdir) \
-	    && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
-	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
-	           *) \
-	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
-	         esac; \
-	       }; \
-	else \
-	  $(MAKE) $${lang}.po-create; \
-	fi
-
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	  for file in $(DISTFILES.common) Makevars.template; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  for file in Makevars; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-install-data-no: all
-install-data-yes: all
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $(DESTDIR)$$dir; \
-	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
-	    fi; \
-	  done; \
-	done
-
-install-strip: install
-
-installdirs: installdirs-exec installdirs-data
-installdirs-exec:
-installdirs-data: installdirs-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	else \
-	  : ; \
-	fi
-installdirs-data-no:
-installdirs-data-yes:
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $(DESTDIR)$$dir; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	    fi; \
-	  done; \
-	done
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall: uninstall-exec uninstall-data
-uninstall-exec:
-uninstall-data: uninstall-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  for file in $(DISTFILES.common) Makevars.template; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-uninstall-data-no:
-uninstall-data-yes:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	  done; \
-	done
-
-check: all
-
-info dvi ps pdf html tags TAGS ctags CTAGS ID:
-
-mostlyclean:
-	rm -f remove-potcdate.sed
-	rm -f stamp-poT
-	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-	rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f stamp-po $(GMOFILES)
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
-	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
-	@$(MAKE) dist2
-# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  dists="$$dists Makevars.template"; \
-	fi; \
-	if test -f $(srcdir)/$(DOMAIN).pot; then \
-	  dists="$$dists $(DOMAIN).pot stamp-po"; \
-	fi; \
-	if test -f $(srcdir)/ChangeLog; then \
-	  dists="$$dists ChangeLog"; \
-	fi; \
-	for i in 0 1 2 3 4 5 6 7 8 9; do \
-	  if test -f $(srcdir)/ChangeLog.$$i; then \
-	    dists="$$dists ChangeLog.$$i"; \
-	  fi; \
-	done; \
-	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-	for file in $$dists; do \
-	  if test -f $$file; then \
-	    cp -p $$file $(distdir) || exit 1; \
-	  else \
-	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
-	  fi; \
-	done
-
-update-po: Makefile
-	$(MAKE) $(DOMAIN).pot-update
-	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-	$(MAKE) update-gmo
-
-# General rule for creating PO files.
-
-.nop.po-create:
-	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
-	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
-	exit 1
-
-# General rule for updating PO files.
-
-.nop.po-update:
-	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-	cd $(srcdir); \
-	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
-	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
-	       *) \
-	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
-	     esac; \
-	   }; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "msgmerge for $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-$(DUMMYPOFILES):
-
-update-gmo: Makefile $(GMOFILES)
-	@:
-
-# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
-# because execution permission bits may not work on the current file system.
-# Use @SHELL@, which is the shell determined by autoconf for the use by its
-# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
-	cd $(top_builddir) \
-	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
-
-force:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/Makevars b/po/Makevars
index 21db722..79d6710 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
@@ -18,14 +18,14 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Robert Ancell <robert.ancell@canonical.com>
+COPYRIGHT_HOLDER = Simple Scan contributors
 
 # This tells whether or not to prepend "GNU " prefix to the package
 # name that gets inserted into the header of the $(DOMAIN).pot file.
 # Possible values are "yes", "no", or empty.  If it is empty, try to
 # detect it automatically by scanning the files in $(top_srcdir) for
 # "GNU packagename" string.
-PACKAGE_GNU =
+PACKAGE_GNU = no
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5963914..b99bb37 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,15 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/simple-scan.ui
-data/simple-scan.desktop.in
+data/org.gnome.SimpleScan.gschema.xml
 data/simple-scan.appdata.xml.in
+data/simple-scan.desktop.in
+src/app-window.ui
+src/app-window.vala
+src/authorize-dialog.ui
 src/book.vala
-src/book-view.vala
+src/help-overlay.ui
 src/page.vala
-src/page-view.vala
+src/preferences-dialog.ui
+src/preferences-dialog.vala
 src/scanner.vala
 src/simple-scan.vala
-src/ui.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..ab5237f
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,8 @@
+# List of source files that should *not* be translated.
+# Please keep this file sorted alphabetically.
+src/app-window.c
+src/book.c
+src/page.c
+src/preferences-dialog.c
+src/scanner.c
+src/simple-scan.c
diff --git a/po/Rules-quot b/po/Rules-quot
deleted file mode 100644
index baf6528..0000000
--- a/po/Rules-quot
+++ /dev/null
@@ -1,58 +0,0 @@
-# This file, Rules-quot, can be copied and used freely without restrictions.
-# Special Makefile rules for English message catalogs with quotation marks.
-
-DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
-
-.SUFFIXES: .insert-header .po-update-en
-
-en@quot.po-create:
-	$(MAKE) en@quot.po-update
-en@boldquot.po-create:
-	$(MAKE) en@boldquot.po-update
-
-en@quot.po-update: en@quot.po-update-en
-en@boldquot.po-update: en@boldquot.po-update-en
-
-.insert-header.po-update-en:
-	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	ll=`echo $$lang | sed -e 's/@.*//'`; \
-	LC_ALL=C; export LC_ALL; \
-	cd $(srcdir); \
-	if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
-	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
-	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
-	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
-	       ;; \
-	     *) \
-	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
-	       ;; \
-	     esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
-	     ; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "creation of $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-en@quot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
-
-en@boldquot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
-
-mostlyclean: mostlyclean-quot
-mostlyclean-quot:
-	rm -f *.insert-header
diff --git a/po/af.gmo b/po/af.gmo
deleted file mode 100644
index f201cd6..0000000
--- a/po/af.gmo
+++ /dev/null
diff --git a/po/af.po b/po/af.po
index 9144db0..74e8ef9 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2012-09-03 08:13+0000\n"
 "Last-Translator: Dawid de Jager <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
+"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Verleen toegang"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Gebruikersnaam vir hulpbron:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Voor en agter"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Voor"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Terug"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Eenvoudige Skandeer"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Sk_andeer"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "Enkel _Bladsy"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Alle Bladsye Vanaf _Voerder"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "_Staak skandering"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Teks"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_E-pos"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Bladsy"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Roteer _linksom"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Roteer _regsom"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Insny"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter (VSA)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal (VSA)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Pasmaak"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Roteer Insnit"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Beweeg na regs"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Begin 'n nuwe dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Nuwe"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "Skandeer 'n enkelbladsy vanaf die skandeerder"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Skandeer"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Stoor dokument na 'n lêer"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Stoor"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Staak huidige skandering"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roteer die bladsy na links (anti-kloksgewys)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Roteer linksom"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roteer die bladsy na regs (kloksgewys)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Roteer regsom"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Snoei die gekose bladsy"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Insny"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Voorkeure"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Skandeer B_ron"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Teks resolusie"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Foto resolusie:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Skandeer Kant:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Bladsy grootte:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skandeer dokumente"
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Geen skandeerders is beskikbaar nie. Koppel asb.'n skandeerder."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Kan nie aan skandeerder koppel nie"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Nie in staat om te begin skandeer nie"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Skandering het misluk"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Stoor as..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Geskandeerde dokument.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Beeldlêers"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Alle lêers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "Kon nie die leêr stoor nie"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Aangaande Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -544,189 +569,189 @@ msgstr ""
 "  Willem van der Colff https://launchpad.net/~wilalla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (verstek resolusie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoë resolusie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Verander _skandeerder"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/am.gmo b/po/am.gmo
deleted file mode 100644
index 3ac8613..0000000
--- a/po/am.gmo
+++ /dev/null
diff --git a/po/am.po b/po/am.po
index 61117be..3583525 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2015-03-15 04:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Amharic <am@li.org>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_መፍቀጃ"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_የተጠቃሚ ስም ለምንጮቹ:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_የመግቢያ ቃል:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "ፊት ለፊት እና ጀርባ"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "ፊት ለፊት"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "ጀርባ"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "ቀላል ማሰሻ"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_ሰነድ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "ማሰ_ሻ"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "ነጠላ _ገጽ"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "ሁሉንም ገጾች ከ _መጋቢው"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "ማሰሻ _ማስቆሚያ"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "ጽሁፍ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "ፎቶ"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "ገጾች መመዝገቢያ"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_ኢሜይል"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_ገጽ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "ወደ _ግራ ማዞሪያ"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "ወደ _ቀኝ ማዞሪያ"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "መከርከሚያ"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_ምንም"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_ደብዳቤ"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "ሕጋ_ዊ"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_ማስተካከያ"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "መከርከሚያ _ማዞሪያ"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "ወደ ግራ ማንቀሳቀሻ"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "ወደ ቀኝ ማንቀሳቀሻ"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_እርዳታ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_ይዞታዎች"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "አዲስ ሰነድ ማስጀመሪያ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "አዲስ"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "ነጠላ ገጽ ከ ማሰሻው ላያ ማሰሻ"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "ማሰሻ"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "ሰነድ ወደ ፋይል ማስቀመጫ"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "ማስቀመጫ"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "የ አሁኑን ማሰሻ ማስቆሚያ"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "ማስቆሚያ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ገጽ ወደ ግራ ማዞሪያ (ከ ቀኝ-ወደ ግራ)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "ወደ ግራ ማዞሪያ"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ገጽ ወደ ቀኝ ማዞሪያ (ከ ግራ-ወደ ቀኝ)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "ወደ ቀኝ ማዞሪያ"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "የተመረጠውን ገጽ መከርከሚያ"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "መከርከሚያ"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "ምርጫዎች"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "የ ማሰሻ ም_ንጮች:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "የ _ጽሁፍ ሪዞልሽን:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "የ _ፎቶ ሪዞልሽን:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "የ ጎን ማሰሻ:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "የ ገጽ መጠን"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "ብሩህነት:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "ማነፃፃሪያ:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "ጥራት:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "ሰነድ ማሰሻ"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "ሰነድ ማሰሻ"
 
@@ -308,7 +322,7 @@ msgstr "ማሰሻ;ማሰሻ;ጠፍጣፋ;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "ዝግጁ ማሰሻ አልተገኘም: እባክዎን ማሰሻ ያገናኙ"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "ከ ማሰሻ ጋር መገናኘት አልተቻለም"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
-msgstr ""
+msgstr "ማሰሻ ማስጀመር አልተቻለም"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
-msgstr ""
+msgstr "ስህተት ተፈጥሯል ከ ማሰሻ ጋር ለ መገናኘት ሲሞከር"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "የተለቀቀውን እትም ማሳያ"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
-msgstr ""
+msgstr "የ ማስተካከያ መልእክቶች ማተሚያ"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
+msgstr "በ አሮጌ እትም የ ተፈጠሩ የ PDF ፋይሎች መጠገኛ"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "ማሰስ አልተቻለም"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
-msgstr ""
+msgstr "[DEVICE...] - አካላቶች በ ማሰስ ላይ"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "ያስኪዱ '%s --እርዳታ'  ዝግጁ የሆኑ የትእዛዝ መስመሮችን ለማየት"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "_መዝጊያ"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "የተጠቃሚ ስም እና የመግቢያ ቃል ያስፈልጋል እዚህ ጋር ለመድረስ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "ምንም ማሰሻ አልተገኘም"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
-msgstr ""
+msgstr "እባክዎን ማሰሻው መሰካቱን እና መብራቱን እርግጠኛ ይሁኑ"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
-msgstr ""
+msgstr "ተጨማሪ ሶፍትዌር ያስፈልጋል"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "ተጨማሪ የ ማሰሻ ሶፍትዌር መግጠም ያስፈልጋል"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "ማስቀመጫ እንደ..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_መሰረዣ"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_ማሰቀመጫ"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
-msgstr ""
+msgstr "የ ታሰሱ ሰነዶች.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "የምስል ፋይሎች"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "ሁሉንም ፋይሎች"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (በርካት-ገጽ ሰነድ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (የታመቀ)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (ያልታመቀ)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
+msgstr "የ ፋይል አቀራረብ"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "ፋይሉን ማስቀመጥ አልተቻለም"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "የ አሁኑን ሰነድ ላስቀምጠው?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "ለውጦቹን ማስወገጃ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
-msgstr ""
+msgstr "ምስል ለ ቅድመ እይታ ማስቀመጥ አልተቻለም"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "ምስል ለ መክፈት አልተቻለም ለ ቅድመ እይታ ማስቀመጥ መተግባሪያ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
-msgstr ""
+msgstr "ጎኖች መቀላቀያ"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "ጎኖች መቀላቀያ (በ ግልባጭ)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
-msgstr ""
+msgstr "በ ግልባጭ"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "ሳይቀየር ማስቀመጫ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
-msgstr ""
+msgstr "የ እርዳታ ፋይል መክፈት አልተቻለም"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -520,210 +545,228 @@ 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.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "ሰለ ቀላል ማሰሻ"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "የ ቀላል ሰነድ ማሰሻ መሳሪያ"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  samson https://launchpad.net/~sambelet"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "ሰነዱን ላስቀምጥ ከ መጥፋቱ በፊት?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
-msgstr ""
+msgstr "ሳይቀምጥ ላጥፋው?"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "እርስዎ ያለዎት ማሰሻ ብራዘር ነው"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
+"ዝግጁ Drivers እዚህ ይገኛሉ በ <a href=\"http://support.brother.com\">Brother "
+"website</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "እርስዎ ያለዎት ማሰሻ ሳምሰንግ ነው"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
+"ዝግጁ Drivers እዚህ ይገኛሉ በ <a href=\"http://samsung.com/support\">Samsung "
+"website</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "እርስዎ ያለዎት ማሰሻ ኤችፒ ነው"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "እርስዎ ያለዎት ማሰሻ ኤፕሰን ነው"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"ዝግጁ Drivers እዚህ ይገኛሉ በ <a href=\"http://support.epson.com\">Epson "
+"website</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
-msgstr ""
+msgstr "Drivers መግጠሚያ"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "እርስዎ ከ ገጠሙ በኋላ ቀላል ማሰሻን እንደገና ማስነሳት ያስፈልጋል"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
-msgstr ""
+msgstr "በ መግጠም ላይ drivers..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Drivers ተሳክቶ ተገጥሟል!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "መግጠም አልተቻለም drivers (የ ስህተት ኮድ %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "መግጠም አልተቻለም drivers"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "እርስዎ መግጠም አለብዎት %s ጥቅል(ሎች)."
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ነባር)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d dpi (ንድፍ)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (ከፍተኛ ሪዞሊሽን)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "አዲስ ሰነድ"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "ሰነድ"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "ኢሜይል..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "ማተሚያ..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "እርዳታ"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "ስለ"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "ማጥፊያ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "_ማሰሻ መቀየሪያ"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
-msgstr ""
+msgstr "Drivers መግጠሚያ"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "ራሱ በራሱ"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
-msgstr ""
+msgstr "ማጥቆሪያ"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
-msgstr ""
+msgstr "ነጣ ማድረጊያ"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "ትንሽ"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "ተጨማሪ"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "አነስተኛ"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
-msgstr ""
+msgstr "ከፍተኛ"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
-msgstr ""
+msgstr "ሰነድ በማስቀመጥ ላይ..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr ""
+msgstr "ገጽ በማስቀመጥ ላይ %d ከ %d"
 
 #~ msgid "Contrast of scan"
 #~ msgstr "የ ማሰሻ ማነፃፀሪያ"
diff --git a/po/ar.gmo b/po/ar.gmo
deleted file mode 100644
index ed3134d..0000000
--- a/po/ar.gmo
+++ /dev/null
diff --git a/po/ar.po b/po/ar.po
index e678056..6d80901 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 08:56+0000\n"
-"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
+"PO-Revision-Date: 2017-03-29 06:36+0000\n"
+"Last-Translator: Khalid Abu Shawarib <k-killer-7@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_خوّل"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "اسم _مستخدم المورد:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_كلمة السر:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "الخلف والأمام"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "الأمام"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "الخلف"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "الماسحة الضوئية"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "م_ستند"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "امسح"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "صفحة مفردة"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "كل الصفحات من  _المغذّي"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "أو_قف المسح"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "نص"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "صورة"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_بريد إلكتروني"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_صفحة"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "أدر  ي_سارًا"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "أدر ي_مينًا"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "ا_قتصاص"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "لا _شيء"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_خطاب"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "_قانوني"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_مخصص"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "أ_در الاقتصاص"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "تحرك لليسار"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "تحرك لليمين"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_مساعدة"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "ال_محتويات"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "ابدأ مستندا جديدا"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "جديد"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "امسح صفحة مفردة من الماسحة"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "امسح"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "احفظ المستند في ملف"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "احفظ"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "أوقف المسح الحالي"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "أوقف"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "أدر الصفحة لليسار (عكس عقارب الساعة)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "أدر يسارا"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "أدر الصفحة لليمين (مع عقارب الساعة)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "أدر يمينا"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "اقتص الصفحة المحددة"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "اقتصاص"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "التفضيلات"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "م_صدر المسح:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "ميز ال_نص"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "ميز ال_صورة:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "جهة المسح:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "حجم الصفحة:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
-msgstr ""
+msgstr "السطوع:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
-msgstr ""
+msgstr "التباين:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
+msgstr "الجودة:"
+
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
 msgstr ""
 
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "امسح المستندات"
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "لا توجد أي ماسحات. من فضلك وصّل ماسحة."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "تعذّر الاتصال بالماسحة"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "تعذّر بدء المسح"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "خطأ في التواصل مع الماسحة"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "اعرض رقم الإصدارة"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "اطبع رسائل التنقيح"
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "فشل المسح"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[جهاز...] - أداة مسح ضوئي"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "نفّذ '%s --help' لعرض القائمة الكاملة لخيارات سطر الأوامر المُتاحة."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "اسم مستخدم وكلمة سر مطلوبين للنفاذ إلى '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "لم يُعثر على أي ماسحة"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "يرجى التحقق من أنّ الماسحة متصلة وتعمل"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "مستند ممسوح.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "ملفات الصور"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "كل الملفات"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF‏ (مستند متعدد الصفحات)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "‏JPEG (مضغوط)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "‏PNG (غير فقود)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "فشل حفظ الملف"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "أأحفظ المستند الحالي؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "ارفض التغيرات"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "تعذّر حفظ الصورة للمعاينة"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "تعذر فتح معاين الصور"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
-msgstr ""
+msgstr "مزج الجهتين"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "مزج الجهتين (عكسي)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
-msgstr ""
+msgstr "عكس"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "أبق بدون تعديل"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -532,16 +557,16 @@ msgstr ""
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "عن \"الماسحة الضوئية\""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -558,189 +583,189 @@ msgstr ""
 "  rashed alhazimi https://launchpad.net/~linex"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "أُخرج دون حفظ"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d نقطة\\بوصة (دقة عالية)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d نقطة\\بوصة"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
-msgstr ""
+msgstr "مستند جديد"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
-msgstr ""
+msgstr "مستند"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
-msgstr ""
+msgstr "إيميل..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
-msgstr ""
+msgstr "طباعة..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
-msgstr ""
+msgstr "مساعدة"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
-msgstr ""
+msgstr "حول"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
-msgstr ""
+msgstr "خروج"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "آلي"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
-msgstr ""
+msgstr "أغمق"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
-msgstr ""
+msgstr "اقتح"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
-msgstr ""
+msgstr "أقل"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
-msgstr ""
+msgstr "أكثر"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
-msgstr ""
+msgstr "الأدنى"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
-msgstr ""
+msgstr "اﻷقصى"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "يحفظ المستند..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "يحفظ الصفحة %d من أصل %d"
diff --git a/po/ast.gmo b/po/ast.gmo
deleted file mode 100644
index cab596b..0000000
--- a/po/ast.gmo
+++ /dev/null
diff --git a/po/ast.po b/po/ast.po
index 667c342..2c14603 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,298 +7,312 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 08:57+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
+"PO-Revision-Date: 2017-03-29 06:26+0000\n"
+"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
 "Language-Team: Asturian <ast@li.org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nome d'usuariu pal recursu:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contraseña"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
-msgstr ""
+msgstr "Anversu y reversu"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
-msgstr ""
+msgstr "Anversu"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
-msgstr ""
+msgstr "Reversu"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Documentu"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
-msgstr ""
+msgstr "Esc_anear"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "U_na páxina"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Tol_es páxines dende l'alimentador"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
-msgstr ""
+msgstr "_Parar d'escanear"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Testu"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Semeya"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Reordenar les páxines"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
-msgstr ""
+msgstr "_Corréu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Voltiar a la e_squierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Voltiar a la _Drecha"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Dengún"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Lle_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Personalizáu"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Voltiar recorte"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
-msgstr ""
+msgstr "Mover a la izquierda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
-msgstr ""
+msgstr "Mover a la drecha"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ayuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
-msgstr ""
+msgstr "_Conteníos"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
-msgstr ""
+msgstr "Crear un documentu nuevu"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
-msgstr ""
+msgstr "Nuevu"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
-msgstr ""
+msgstr "Escanear una sola páxina dende l'escáner"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
-msgstr ""
+msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
-msgstr ""
+msgstr "Guardar documentu nun ficheru"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
-msgstr ""
+msgstr "Guardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Para l'escaneáu actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Voltiar la páxina a la esquierda (contrariu a les aguyes del reló)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
-msgstr ""
+msgstr "Voltiar a la esquierda"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Voltiar la páxina a la drecha (contrariu a les aguyes del reló)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
-msgstr ""
+msgstr "Voltiar a la drecha"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Recortar la páxina esbillada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
-msgstr ""
+msgstr "Recortar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferencies"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Escan_ear:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Resolución de _testu:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "Resolución de _fotografía:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
-msgstr ""
+msgstr "Escanear la cara:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
-msgstr ""
+msgstr "Tamañu de páxina:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Brillu:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Calidá:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
-msgstr ""
+msgstr "Escanear documentos"
 
 #: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
@@ -308,7 +322,7 @@ msgstr "escanear;escáner;planu;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,198 +330,209 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Nun hai escáneres disponibles. Coneuta un escáner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Nun puede coneutase col escáner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Nun puede anicase l'escáner"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 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
+#: 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
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Amosar mensaxes de depuración"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Falló al escanerr"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PRESÉU...] - Utilidá d'escanéu"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 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."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "_Zarrar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, 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.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Nun se deteutó dengún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor comprueba que l'escáner ta coneutáu y activáu"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Encaboxar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Guardar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Documentu Escaneáu.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
-msgstr ""
+msgstr "Ficheros d'imaxe"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
-msgstr ""
+msgstr "Tolos Ficheros"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (documentu multipáxina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (comprimíu)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (ensin perda)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 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.vala:673
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Los cambeos van perdese pa siempres si nun los atroxes."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
-msgstr ""
+msgstr "¿Guardar el documentu actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
-msgstr ""
+msgstr "Descartar los cambeos"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Nun puede abrise l'aplicación de vista previa d'imaxes"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "Combinar llaos"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "Combinar llaos (inversu)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Inversu"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Caltener ensin cambeos"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Nun pudo abrise'l ficheru d'ayuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -536,16 +561,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -555,189 +580,189 @@ msgstr ""
 "  ivarela https://launchpad.net/~ivarela"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "¿Atroxar los cambeos enantes de colar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Colar ensin atroxar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
-msgstr ""
+msgstr "%d ppp (predetermináu)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Documentu nuevu"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Documentu"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Corréu-e..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Imprentar..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Tocante a"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Quitar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Camudar d'e_scáner"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
-msgstr ""
+msgstr "Automáticu"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Más escuru"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Más claru"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Mínimu"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Máximu"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Guardando documentu..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la páxina %d de %d"
diff --git a/po/az.gmo b/po/az.gmo
deleted file mode 100644
index 7ec7301..0000000
--- a/po/az.gmo
+++ /dev/null
diff --git a/po/az.po b/po/az.po
index c2f312f..d2b0e83 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2015-01-01 15:02+0000\n"
 "Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Şifrə:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Hər iki üz"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Ön"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Arxa"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Sәnәd"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr ""
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "_AvtoYükləmədəki bütün səhifələr"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Mətn"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Epoçt"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Səhifə"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Seçilmiş səhifəni kəs"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Kəs"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -539,189 +564,189 @@ msgstr ""
 "  Nicat Məmmədov https://launchpad.net/~nicat455"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/bg.gmo b/po/bg.gmo
deleted file mode 100644
index 62c8b69..0000000
--- a/po/bg.gmo
+++ /dev/null
diff --git a/po/bg.po b/po/bg.po
index 53c66e6..35ef68e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Идентификация"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Потребителско име за ресурса:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Парола:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Предна и обратна страна"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Предна страна"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Обратна страна"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Опростено сканиране"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Ска_ниране"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "Една _страница"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Всички страници от _подавача"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "_Спири сканирането"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Снимка"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "Изпрати по _имейл"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Завърти _наляво"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Завърти на_дясно"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Изрежи"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Нищо"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Персонализирано"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Завърти изрязаното"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Премести наляво"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Премести надясно"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Помощ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Съдържание"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Създай нов документ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Нов"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "Сканиране на една страница със скенера"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Сканирай"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Съхрани документа като файл"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Съхрани"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Спри текущото сканиране"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Спри"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Завърти страницата на ляво (обратно на часовниковата стрелка)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Завърти наляво"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Завърти страницата на дясно (по часовниковата стрелка)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Завърти надясно"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Изрежи избраната страница"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Изрежи"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Изт_очник на сканиране:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Резолюция на текста:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Резолюция на снимката:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Избор на страна за сканиране:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Размер на листа:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Яркост:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Контраст:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Качество:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Сканиране на документи"
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,197 +330,208 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Няма налични скенери. Моля свържете скенер."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Не може да се осъществи връзка със скенера"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Сканирането не може да бъде стартирано"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Грешка при комуникацията със скенера"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Покажи версията"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Показвай съобщения за изчистване на грешки"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Неусшно сканиране"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Инструмент за сканиране"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Изпълнете „%s --help“, за да видите списъка с всички опции на командния ред."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "_Затвори"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Необходими са потребителско име и парола за достъп до '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Не са открити скенери"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Моля проверете дали скенерът ви е свързан и включен"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Съхрани като..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Отмени"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Съхрани"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Сканиран документ.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Файлове с изображения"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Всички файлове"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (документ с много страници)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (компресирани)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (без загуби на качеството)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "Неусшно съхраняване на файла"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "Да съхраним ли текущия документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Откажи промените"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "Изображението не може да бъде запазено за предварителен преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Невъзможно е отварянето на приложение за преглед на изображението"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Помощния файл не може да бъде отворен"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -537,16 +562,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "За програмата"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -559,189 +584,189 @@ msgstr ""
 "  Филип Андонов https://launchpad.net/~vonodna"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "Да съхраня ли документа, преди да затворите програмата?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Излез без запазване"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по подразбиране)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (чернова)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Смени _скенера"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Тъмно"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Светло"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Малко"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Много"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Минимално"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Максимално"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Съхраняване на документа..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Съхраняване на страница %d от %d"
diff --git a/po/bo.gmo b/po/bo.gmo
deleted file mode 100644
index 5214c5a..0000000
--- a/po/bo.gmo
+++ /dev/null
diff --git a/po/bo.po b/po/bo.po
index cbe7c76..fa457eb 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "ཐོབ་ཐང་སྟེར_A"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "གཏེར་མཛོད་སྤྱོད་མཁན་གྱི་མིང་_U:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "གསང་གྲངས_P:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "རྒྱབ་ཕྱོགས་དང་མདུན་ཕྱོགས"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "མདུན་ཕྱོགས"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "རྒྱབ་ཕྱོགས"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "པར་བཤུ་དཀྱུས་མ"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "ཡི་གེ_D"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "པར་བཤུ_a"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "ཤོག་བུ་རྐང་ཅིག _P"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "སྤྲོད་མཁན་ནས་བྱུང་བའི་ཤོག་ལེབ་ཡོངས་རྫོགས _F"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "པར་ལེན་མཚམས་བཞག_S"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "ཡི་གེ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "པར"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "གློག་འཕྲིན_E"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "ཤོག་ལེབ_P"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "གཡོན་སྐོར _L"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "གཡས་སྐོར་ _R"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "གཅོད_C"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "ཅི་མེད་པ_N"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "འཕྲིན་ཡིག_L"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "ཁྲིམས་མཐུན_g"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "སྲོལ་རྒྱུན_C"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "དྲས་གཅོད་སྐོར་བ_R"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "གཡོན་ལ་སྤོར"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "གཡས་ལ་སྤོར"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "རོགས་རམ_H"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "ནང་གསེས_C"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "ཡིག་གེ་གསར་འཛུགས"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "གསར་པ"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "པར་བཤུ་ཆས་ནས་བྱུང་བའི་ཤོག་བུ་རྐང་ཅིག་དེ་པར་བཤུ"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "པར་བཤུ"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "གསོག་ཉར"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "པར་བཤུ་བྱེད་བཞིན་པ་དེ་མཚམས་བཞག"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "མཚམས་བཞག"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ཤོག་ལེབ་གཡོན་སྐོར་རྒྱག་པ"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "གཡོན་སྐོར"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ཤོག་ལེབ་གཡས་སྐོར་རྒྱག་པ"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "གཡས་སྐོར"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "བདམས་ཟིན་པའི་ཤོག་ལེབ་གཅད་བཟོ"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "གཅད"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "རང་མོས་སྒྲིག་བཟོ"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "པར་བཤུ་གཏེར་མཛོད_o:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "ཡི་གེའི་སྤུས་ཚད_T"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "པར་གྱི་སྤྭུས་ཚད"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "ཟུར་པར་བཤུ"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "ཤོག་ལེབ་ཞེང་ཚད"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "དཀར་ཚད:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "སྤུས་ཚད:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "ཡིག་གེ་པར་བཤུ"
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "པར་བཤུ་ཆས་བསྒྲིགས་མི་འདུག པར་བཤུ་ཆས་ཞིག་སྒྲིགས་རོགས"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "པར་བཤུ་ཆས་དང་སྦྲེལ་མ་ཐུབ"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "པར་བཤུ་འགོ་འཛུགས་མ་ཐུབ"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "པར་བཤུ་ཆས་དང་འབྲེལ་གཏུགས་མ་ཐུབ་པའི་ནོར་འཁྲུལ"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "པར་བཤུ་བྱེད་མ་ཐུབ་པ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s'མཁོ་སྤྱོད་བྱེད་པར་སྤྱོད་མཁན་མིང་དང་གསང་གྲངས་དགོས་པ"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "པར་བཤུ་ཆས་རྙེད་མ་བྱུང་"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "ཁྱོད་ཀྱི་པར་བཤུ་ཆས་སྦྲེལ་ཡོད་པ་དང་གློག་བཏང་ཡོད་པར་དག་བཤེར་བྱེད་རོགས"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "ཉར་སྟངས་་་"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "གཟུགས་བརྙན་ཡིག་ཆ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "ཡིག་ཆ་ཡོངས་རྫོགས"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF(ཤོག་ལེབ་མང་པོའི་ཡིག་ཆ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (བསྡུ་འཇུག)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (བོར་བརླག་མ་ཤོར་བ)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "ཡིག་ཆ་གསོག་འཇོག་བྱེད་མ་ཐུབ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "དང་ཐོག་གི་ཡིག་ཆ་ཉར་ཚགས"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "བཟོ་བཅོས་རྣམས་འདོར་བ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "སྔོན་ལྟ་ཉེར་སྤྱོད་ཁ་ཕྱེ་མ་ཐུབ་པ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "རོགས་འདེགས་ཡིག་ཆ་ཁ་ཕྱེ་མ་ཐུབ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -534,16 +559,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "པར་བཤུ་བ་དཀྱུས་མའི་སྐོར"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "ཡིག་ཆ་པར་བཤུ་ཆས་དཀྱུས་མ"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -551,189 +576,189 @@ msgstr ""
 "  Tennom https://launchpad.net/~tennomyathog"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག་འཇོག་བྱེད་པ"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (སྔོན་འཛུགས)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ཟིན་བྲིས)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "ར་ང་འགུལ་ངང"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/boldquot.sed b/po/boldquot.sed
deleted file mode 100644
index 4b937aa..0000000
--- a/po/boldquot.sed
+++ /dev/null
@@ -1,10 +0,0 @@
-s/"\([^"]*\)"/“\1”/g
-s/`\([^`']*\)'/‘\1’/g
-s/ '\([^`']*\)' / ‘\1’ /g
-s/ '\([^`']*\)'$/ ‘\1’/g
-s/^'\([^`']*\)' /‘\1’ /g
-s/“”/""/g
-s/“/“/g
-s/”/”/g
-s/‘/‘/g
-s/’/’/g
diff --git a/po/ca.gmo b/po/ca.gmo
deleted file mode 100644
index 7fd4d6f..0000000
--- a/po/ca.gmo
+++ /dev/null
diff --git a/po/ca.po b/po/ca.po
index fa80893..14706cb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,519 +2,537 @@
 # 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.
-#
+# Jordi Serratosa <jordis@softcatala.cat>, 2017.
+#  Adolfo Jayme https://launchpad.net/~fitojb\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"
+#  Walter Garcia-Fontes https://launchpad.net/~walter-garcia\n"
+#  pancake https://launchpad.net/~pancake"
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-12-24 18:03+0000\n"
-"Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-08 11:00+0000\n"
+"PO-Revision-Date: 2017-09-01 14:42+0200\n"
+"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan <ca@li.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-25 05:04+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoritza"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositiu d'escaneig"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Nom d'usuari del recurs:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositiu SANE per a l'adquisició d'imatges."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Contrasenya:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipus de document a escanejar"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Ambdues cares"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+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. Aquest paràmetre decideix la "
+"resolució d'escaneig, els colors i el processament posterior."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Anvers de la pàgina"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Amplada del paper en dècimes de mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Revers de la pàgina"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+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:31
+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:35
+msgid "Brightness of scan"
+msgstr "Brillantor de l'escaneig"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrast de l'escaneig"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "L'ajustament del contrast, de -100 a 100 (on 0 indica cap)."
 
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolució per l'escaneig de text"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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:50
+msgid "Resolution for photo scans"
+msgstr "Resolució per l'escaneig de fotos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Cara de la pàgina a escanejar"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "La cara de la pàgina a escanejar."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directori on desar els fitxers"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Retard en mil·lisegons entre pàgines"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Retard en mil·lisegons entre pàgines."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Escanegeu documents"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Esc_aneja"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Una manera realment senzilla d'escanejar tant documents com fotos. Podeu "
+"retallar les parts dolentes d'una foto o girar-la si està en la posició "
+"incorrecta.  Podeu imprimir els vostres escanejos, exportar-los a pdf, o "
+"desar-los en diversos formats d'imatge."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"L'Escaneig senzill fa servir l'entorn SANE per donar suport a la major part "
+"dels escàners existents."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Escàner de documents"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "escanejar;escàner;pla;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Pàgina _individual"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Totes les pàgines de l'a_limentador"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Atura l'escaneig"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiples pàgines des d'un escàner pla"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Esc_aneja"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Atura l'escaneig"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reordena les pàgines"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mou a l'esquerra"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "C_ontingut"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Comença un document nou"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nou"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Desa"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Atura l'escaneig actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Atura"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-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:750
-msgid "Rotate Left"
-msgstr "Gira a l'esquerra"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "S'estan cercant escànners…"
 
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Gira a la dreta"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Escapça la pàgina seleccionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Escapça"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferències"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Font d'_escaneig:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Resolució de text:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Resolució fotogràfica:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Cara a escanejar:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Mida de la pàgina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brillantor:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualitat:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Escanejador de documents"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Escanegeu documents"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Tanca"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "escanejar;escàner;pla;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "escàner"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "A punt per escanejar"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Una manera realment senzilla d'escanejar tant documents com fotos. Podeu "
-"retallar les parts dolentes d'una foto o rotar-la si està en la posició "
-"incorrecta.  Podeu imprimir els vostres escanejos, exportar-los a pdf, o "
-"desar-los en diversos formats d'imatge."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Cal un programari addicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"El Simple Scan fa servir l'entorn SANE per donar suport a la major part dels "
-"escàners existents."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-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:1223
-msgid "Unable to start scan"
-msgstr "No s'ha pogut iniciar l'escaneig"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Ha fallat l'escaneig"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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'ordres."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Tanca"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
+"Heu <a href=\"install-firmware\">d'instal·lar un programari controlador</a> "
+"per al vostre escàner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 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:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Cal un programari addicional"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Heu d'instal·lar un programari controlador per al vostre escàner."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Anomena i desa..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Anomena i desa…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "De_sa"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimit)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format del fitxer:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressió:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Ja existeix un fitxer amb el nom «%s». Voleu reemplaçar-lo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Reemplaça"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Desament"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "No s'ha pogut desar el fitxer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Voleu desar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "S'està contactant l'e_scàner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Combina els costats"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr "Combina els costats (inrevès)"
+msgstr "Combina els costats (invers)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Reverteix"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Mantingues sense canvi"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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:1472
+#: src/app-window.vala:1271
 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"
@@ -529,7 +547,7 @@ 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 ""
-"Aquest programa és programari lliure: podeu redistribuir-lo l'i/o modificar-"
+"Aquest programa és programari lliure: podeu redistribuir-lo i/o modificar-"
 "lo\n"
 "sota els termes de la Llicència Pública General GNU (GNU GPL) segons publica "
 "la \n"
@@ -546,225 +564,528 @@ msgstr ""
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Quant a l'escaneig senzill"
+msgstr "Quant a l'Escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
-"  Adolfo Jayme https://launchpad.net/~fitojb\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"
-"  Walter Garcia-Fontes https://launchpad.net/~walter-garcia\n"
-"  pancake https://launchpad.net/~pancake"
+"Jordi Mas i Hernàndez (2017)\n"
+"Launchpad contributors (2010-2016)"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Voleu desar el document abans de sortir?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Sembla que teniu un escàner Brother"
+msgstr "Sembla que teniu un escàner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Hi ha controladors disponibles a la <a "
-"href=\"http://support.brother.com\">pàgina web de Brother</a>."
+"Hi ha controladors disponibles a la <a href=\"http://support.brother.com"
+"\">pàgina web de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Sembla que teniu un escàner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Hi ha controladors disponibles a la <a "
-"href=\"http://samsung.com/support\">pàgina web de Samsung</a>."
+"Hi ha controladors disponibles a la <a href=\"http://samsung.com/support"
+"\">pàgina web de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Sembla que teniu un escàner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Sembla que teniu un escàner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Hi ha controladors disponibles a la <a "
-"href=\"http://samsung.com/support\">pàgina web d'Epson</a>."
+"Hi ha controladors disponibles a la <a href=\"http://samsung.com/support"
+"\">pàgina web d'Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instal·la els controladors"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Un cop instal·lat haureu de reiniciar el Simple Scan."
+msgstr "Un cop instal·lat haureu de reiniciar l'Escaneig senzill."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "S'estan instal·lant els controladors..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "S'estan instal·lant els controladors…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "La instal·lació dels controladors ha estat reeixida!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Ha fallat la instal·lació dels controladorse (codi d'error %d)."
+msgstr "Ha fallat la instal·lació dels controladors (codi d'error %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "No s'han pogut instal·lar els controladors."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Heu d'instal·lar el(s) paquet(s) %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Heu d'instal·lar el paquet %s."
+msgstr[1] "Heu d'instal·lar els paquets %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferències"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Dreceres de teclat"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Quant a"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Surt"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Correu electrònic"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Comença de nou…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Escapça la pàgina seleccionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Suprimeix la pàgina seleccionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autoritza"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Nom d'usuari del recurs:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "No s'ha pogut codificar la pàgina %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Escaneig"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Escaneja una sola pàgina"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Escaneja totes les pàgines des de l'alimentador"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Escaneja contínuament des d'un escàner pla"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Atura l'escaneig en curs"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificació del document"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Mou a l'esquerra"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Mou a la dreta"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Suprimeix la pàgina"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestió de documents"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Comença un document nou"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Desa el document escanejat"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Envia per correu el document escanejat"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimeix el document escanejat"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copia la pàgina actual al porta-retalls"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Escàner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Cares a escanejar"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Mida de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Anvers de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Revers de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambdues"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Espera"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Múltiples pàgines des d'un escàner pla"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segons"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "S'està escanejant"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Resolució de text"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Resolució fotogràfica"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Brillantor"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualitat"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automàtic"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Més fosc"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Més clar"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menys"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Més"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Document nou"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "No hi ha cap escàner disponible. Connecteu-ne un."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "No s'ha pogut connectar a l'escàner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Envia per correu electrònic..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "No s'ha pogut iniciar l'escaneig"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimeix..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Ajuda"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostra la versió de llançament"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Quant a"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostra els missatges de depuració"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Surt"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Canvia l'e_scàner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Ha fallat l'escaneig"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instal·la els controladors"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "S'està escanejant"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automàtic"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIU…] - Utilitat d'escaneig"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Més fosc"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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'ordres."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Més clar"
+#~ msgid "Front and Back"
+#~ msgstr "Ambdues cares"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menys"
+#~ msgid "New"
+#~ msgstr "Nou"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Més"
+#~ msgid "Rotate Left"
+#~ msgstr "Gira a l'esquerra"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínim"
+#~ msgid "Rotate Right"
+#~ msgstr "Gira a la dreta"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Màxim"
+#~ msgid "Crop"
+#~ msgstr "Escapça"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "S'està desant el document..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Font d'_escaneig:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "S'està desant la pàgina %d de %d"
+#~ msgid "New Document"
+#~ msgstr "Document nou"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Email..."
+#~ msgstr "Envia per correu electrònic..."
+
+#~ msgid "Print..."
+#~ msgstr "Imprimeix..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instal·la els controladors"
+
+#~ msgid "Minimum"
+#~ msgstr "Mínim"
+
+#~ msgid "Maximum"
+#~ msgstr "Màxim"
+
+#~ msgid "Saving document..."
+#~ msgstr "S'està desant el document..."
+
+#~ 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"
@@ -772,7 +1093,6 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "Forma d'ús:\n"
 #~ "  %s [DISPOSITIU...] - Utilitat d'escaneig"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -785,8 +1105,8 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "  --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"
+#~ "  --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"
@@ -803,48 +1123,28 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Manquen fitxers"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Alçada del paper en dècimes parts d'un mm"
-
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Alçada de la imatge escanejada en píxels"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolució per l'escaneig de fotos"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositiu d'escaneig"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Direcció de l'escaneig"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Cara de la pàgina a escanejar"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Directori on desar els fitxers"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "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)"
+#~ "El costat de la pàgina a escanejar. Pot ser un dels següents: "
+#~ "«both» (ambdós), «front» (frontal) o «back» (dorsal)"
 
 #~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "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 ""
-#~ "L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-#~ "paper)."
-
-#~ 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)."
+#~ "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 "TRUE if the application window is maximized"
 #~ msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
@@ -853,14 +1153,8 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "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. Aquest valor s'ha actualitzat al "
-#~ "que tenia l'última pàgina escanejada."
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositiu SANE per a l'adquisició d'imatges."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolució per l'escaneig de text"
+#~ "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
+#~ "al que tenia l'última pàgina escanejada."
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
@@ -870,29 +1164,13 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgstr "Resolució de l'última imatge escanejada"
 
 #~ 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."
-
-#~ 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)"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipus de document a escanejar"
-
-#~ 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."
+#~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i "
+#~ "el postprocessament."
 
 #~ msgid "Window height in pixels"
 #~ msgstr "Alçada de la finestra en píxels"
@@ -901,28 +1179,18 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgstr "Amplada de la finestra en píxels"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "La resolució en punts per polzada quan s'escanegi text."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+#~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha "
+#~ "actualitzat al que tenia l'última pàgina escanejada."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Amplada de la imatge escanejada en píxels"
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Amplada del paper en dècimes de mm"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Seleccioneu el _tipus de fitxer"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -938,36 +1206,5 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
 #~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Document escanejat"
-
-#~ msgid "The page side to scan."
-#~ msgstr "La cara de la pàgina a escanejar."
-
-#~ 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. Aquest paràmetre decideix la "
-#~ "resolució d'escaneig, els colors i el processament posterior."
-
 #~ 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."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrast de l'escaneig"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Brillantor de l'escaneig"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
diff --git a/po/ca@valencia.gmo b/po/ca@valencia.gmo
deleted file mode 100644
index 938ad71..0000000
--- a/po/ca@valencia.gmo
+++ /dev/null
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 90cddce..d8a8def 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -1,514 +1,538 @@
-# Catalan (Valencian) translation for simple-scan
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Catalan 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>, 2011.
-#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Jordi Serratosa <jordis@softcatala.cat>, 2017.
+#  Adolfo Jayme https://launchpad.net/~fitojb\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"
+#  Walter Garcia-Fontes https://launchpad.net/~walter-garcia\n"
+#  pancake https://launchpad.net/~pancake"
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-18 22:10+0000\n"
+"PO-Revision-Date: 2017-09-01 14:42+0200\n"
+"Last-Translator: Xavi Ivars <xavi.ivars@gmail.com>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"Language: ca-valencia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoritza"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositiu d'escaneig"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Nom d'usuari del recurs:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositiu SANE per a l'adquisició d'imatges."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Contrasenya:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipus de document a escanejar"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Ambdues cares"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+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."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Anvers de la pàgina"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Amplària del paper en dècimes de mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Revers de la pàgina"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'amplària del paper en dècimes de mm (o 0 per la detecció automàtica del "
+"paper)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Alçària del paper en dècimes parts d'un mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'alçària del paper en dècimes de mm (o 0 per la detecció automàtica del "
+"paper)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brillantor de l'escaneig"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrast de l'escaneig"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "L'ajustament del contrast, de -100 a 100 (on 0 indica cap)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolució per l'escaneig de text"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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:50
+msgid "Resolution for photo scans"
+msgstr "Resolució per l'escaneig de fotos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Cara de la pàgina a escanejar"
 
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "La cara de la pàgina a escanejar."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directori on guardar els fitxers"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"El directori on guardar els fitxers. Per defecte serà el directori de "
+"documents si no es defineix."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Retard en mil·lisegons entre pàgines"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Retard en mil·lisegons entre pàgines."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Escanegeu documents"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Esc_aneja"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Una manera realment senzilla d'escanejar tant documents com fotos. Podeu "
+"retallar les parts dolentes d'una foto o girar-la si està en la posició "
+"incorrecta.  Podeu imprimir els vostres escanejos, exportar-los a pdf, o "
+"guardar-los en diversos formats d'imatge."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"L'Escaneig senzill fa servir l'entorn SANE per donar suport a la major part "
+"dels escàners existents."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Escàner de documents"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "escanejar;escàner;pla;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Pàgina _individual"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Totes les pàgines de l'a_limentador"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Atura l'escaneig"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiples pàgines des d'un escàner pla"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Esc_aneja"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Atura l'escaneig"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reordena les pàgines"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mou a l'esquerra"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "C_ontingut"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Comença un document nou"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nou"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Guarda el document en un fitxer"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Guarda"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
-msgstr "Para l'escaneig actual"
+msgstr "Atura l'escaneig actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
-msgstr "Para"
+msgstr "Atura"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-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:750
-msgid "Rotate Left"
-msgstr "Gira a l'esquerra"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-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:765
-msgid "Rotate Right"
-msgstr "Gira a la dreta"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Escapça la pàgina seleccionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Escapça"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferències"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Font d'_escaneig:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Resolució de text:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Resolució fotogràfica:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Cara a escanejar:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Mida de la pàgina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brillantor:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualitat:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "S'estan cercant escànners…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Escanegeu documents"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Tanca"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "A punt per escanejar"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Cal un programari addicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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:871
-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:1223
-msgid "Unable to start scan"
-msgstr "No s'ha pogut iniciar l'escaneig"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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:391
-msgid "Failed to scan"
-msgstr "Ha fallat l'escaneig"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Tanca"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
+"Heu <a href=\"install-firmware\">d'instal·lar un programari controlador</a> "
+"per al vostre escàner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 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:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Anomena i guarda..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Anomena i guarda…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "Al_ça"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimit)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Format del fitxer:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressió:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Ja existeix un fitxer amb el nom «%s». Voleu reemplaçar-lo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Reemplaça"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Desament"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "No s'ha pogut guardar el fitxer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
 msgstr "Si no ho guardeu, els canvis es perdran per sempre més."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Voleu guardar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "S'està contactant l'e_scàner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut guardar la imatge per previsualitzar-la"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
-msgstr ""
+msgstr "Combina els costats"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Combina els costats (invers)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr ""
+msgstr "Reverteix"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Mantingues sense canvi"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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:1472
+#: src/app-window.vala:1271
 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"
@@ -523,7 +547,7 @@ 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 és programari lliure: podeu redistribuir-lo l'i/o modificar-"
+"Este programa és programari lliure: podeu redistribuir-lo i/o modificar-"
 "lo\n"
 "sota els termes de la Llicència Pública General GNU (GNU GPL) segons publica "
 "la \n"
@@ -540,301 +564,528 @@ msgstr ""
 "juntament amb este programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Quant a l'escaneig senzill"
+msgstr "Quant a l'Escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
-"  David Planella https://launchpad.net/~dpm\n"
-"  Joan Duran https://launchpad.net/~jodufi"
+"Jordi Mas i Hernàndez (2017)\n"
+"Launchpad contributors (2010-2016)"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Voleu guardar el document abans d'eixir?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Ix sense guardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Pareix que teniu un escàner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"Hi ha controladors disponibles a la <a href=\"http://support.brother.com"
+"\">pàgina web de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Pareix que teniu un escàner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"Hi ha controladors disponibles a la <a href=\"http://samsung.com/support"
+"\">pàgina web de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Pareix que teniu un escàner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Pareix que teniu un escàner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
+"Hi ha controladors disponibles a la <a href=\"http://samsung.com/support"
+"\">pàgina web d'Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Instal·la els controladors"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Un cop instal·lat haureu de reiniciar l'Escaneig senzill."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "S'estan instal·lant els controladors…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "La instal·lació dels controladors ha estat reeixida!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Ha fallat la instal·lació dels controladors (codi d'error %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "No s'han pogut instal·lar els controladors."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Heu d'instal·lar el paquet %s."
+msgstr[1] "Heu d'instal·lar els paquets %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferències"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (predeterminat)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Dreceres de teclat"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d ppp (esborrany)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ajuda"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d ppp (alta resolució)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Quant a"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Ix"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Correu electrònic"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Comença de nou…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Escapça la pàgina seleccionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Suprimeix la pàgina seleccionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autoritza"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Nom d'usuari del recurs:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
+msgid "Unable to encode page %i"
+msgstr "No s'ha pogut codificar la pàgina %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Escaneig"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Escaneja una sola pàgina"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Escaneja totes les pàgines des de l'alimentador"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Escaneja contínuament des d'un escàner pla"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Atura l'escaneig en curs"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificació del document"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Mou a l'esquerra"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr ""
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Mou a la dreta"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr ""
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr ""
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr ""
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Suprimeix la pàgina"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr ""
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestió de documents"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr ""
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Comença un document nou"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr ""
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Guarda el document escanejat"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Canvia l'e_scàner"
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Envia per correu el document escanejat"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr ""
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimeix el document escanejat"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copia la pàgina actual al porta-retalls"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Escàner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Cares a escanejar"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Mida de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Anvers de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Revers de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambdues"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Espera"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Múltiples pàgines des d'un escàner pla"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segons"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "S'està escanejant"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Resolució de text"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Resolució fotogràfica"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Brillantor"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualitat"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínim"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (predeterminat)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Màxim"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ppp (esborrany)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "S'està guardant el document..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ppp (alta resolució)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "S'està guardant la pàgina %d de %d"
+msgid "%d dpi"
+msgstr "%d ppp"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "No hi ha cap escàner disponible. Connecteu-ne un."
 
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositiu d'escaneig"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "No s'ha pogut connectar a l'escàner"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Direcció de l'escaneig"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "No s'ha pogut iniciar l'escaneig"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Alçada del paper en dècimes parts d'un mm"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Alçada de la imatge escanejada en píxels"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostra la versió de llançament"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Cara de la pàgina a escanejar"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostra els missatges de depuració"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolució per l'escaneig de fotos"
+#: 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"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolució per l'escaneig de text"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Ha fallat l'escaneig"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Resolució de l'última imatge escanejada"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "S'està escanejant"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositiu SANE per a l'adquisició d'imatges."
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIU…] - Utilitat d'escaneig"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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."
 
-#~ 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 "Front and Back"
+#~ msgstr "Ambdues cares"
 
-#~ 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)."
+#~ msgid "New"
+#~ msgstr "Nou"
 
-#~ 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 "Rotate Left"
+#~ msgstr "Gira a l'esquerra"
 
-#~ 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."
+#~ msgid "Rotate Right"
+#~ msgstr "Gira a la dreta"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+#~ msgid "Crop"
+#~ msgstr "Escapça"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "La resolució en punts per polzada quan s'escanegi text."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Font d'_escaneig:"
 
-#~ 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)"
+#~ msgid "New Document"
+#~ msgstr "Document nou"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipus de document a escanejar"
+#~ msgid "Document"
+#~ msgstr "Document"
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Amplada del paper en dècimes de mm"
+#~ msgid "Email..."
+#~ msgstr "Envia per correu electrònic..."
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Amplada de la imatge escanejada en píxels"
+#~ msgid "Print..."
+#~ msgstr "Imprimeix..."
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Alçada de la finestra en píxels"
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instal·la els controladors"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Amplada de la finestra en píxels"
+#~ msgid "Minimum"
+#~ msgstr "Mínim"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Document escanejat"
+#~ msgid "Maximum"
+#~ msgstr "Màxim"
+
+#~ msgid "Saving document..."
+#~ msgstr "S'està desant el document..."
+
+#~ 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"
@@ -842,45 +1093,6 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ "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+"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Seleccioneu el _tipus de fitxer"
-
-#~ msgid "Files missing"
-#~ msgstr "Manquen fitxers"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Comproveu la vostra instal·lació"
-
-#~ 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."
-
-#~ msgid "The page side to scan."
-#~ msgstr "La cara de la pàgina a escanejar."
-
-#~ 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."
-
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -893,8 +1105,8 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ "  --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"
+#~ "  --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"
@@ -902,52 +1114,97 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ "  --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."
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
 
-#~ msgid "Brightness of scan"
-#~ msgstr "Brillantor de l'escaneig"
+#~ msgid "Please check your installation"
+#~ msgstr "Comproveu la vostra instal·lació"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
+#~ msgid "Files missing"
+#~ msgstr "Manquen fitxers"
 
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrast de l'escaneig"
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Alçada de la imatge escanejada en píxels"
 
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
+#~ msgid "Direction of scan"
+#~ msgstr "Direcció de l'escaneig"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
+#~ 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 "Quality value to use for JPEG compression."
-#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
+#~ 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 "TRUE if the application window is maximized"
+#~ msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
 
 #~ 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. Aquest valor s'ha actualitzat al "
-#~ "que tenia l'última pàgina escanejada."
+#~ "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
+#~ "al que tenia l'última pàgina escanejada."
+
+#~ 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."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolució de l'última imatge escanejada"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
 #~ msgstr ""
-#~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
-#~ "al que tenia l'última pàgina escanejada."
+#~ "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."
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Directori on guardar els fitxers"
+#~ msgid "Window height in pixels"
+#~ msgstr "Alçada de la finestra en píxels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Amplada de la finestra en píxels"
 
 #~ 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 guardar 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."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Amplada de la imatge escanejada en píxels"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Seleccioneu el _tipus de fitxer"
+
+#~ 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+"
+
+#~ 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."
diff --git a/po/ce.gmo b/po/ce.gmo
deleted file mode 100644
index 8987b26..0000000
--- a/po/ce.gmo
+++ /dev/null
diff --git a/po/ce.po b/po/ce.po
index aa437b9..af5f741 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2014-08-12 08:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chechen <ce@li.org>\n"
+"Language: ce\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr ""
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr ""
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr ""
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,203 +547,203 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/cs.gmo b/po/cs.gmo
deleted file mode 100644
index f40b2fe..0000000
--- a/po/cs.gmo
+++ /dev/null
diff --git a/po/cs.po b/po/cs.po
index 3d5fa37..204f53c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,519 +1,528 @@
 # Czech 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.
+# Tadeáš Pařík <tadeas.parik@gmail.com>, 2009.
+# Marek Černocký <marek@manet.cz>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2013-12-18 12:25+0000\n"
-"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
-"Language-Team: Czech <cs@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-08 16:47+0200\n"
+"Last-Translator: Marek Černocký <marek@manet.cz>\n"
+"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizovat"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Zařízení určené ke skenování"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Vlastní pojmenování zdroje:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Zařízení SANE pro získávání obrázků."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Heslo:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Typ skenovaného dokumentu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ skenovaného dokumentu. Toto nastavení rozhoduje o rozlišení, barvách a "
+"následném zpracování při skenování."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Přední a zadní"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Šířka papíru v desetinách milimetru"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Přední"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Zadní"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Výška papíru v desetinách milimetru"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+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/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Jas skenu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Nastavení jasu od -100 do 100 (0 znamená žádná hodnota)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast skenu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Nastavení kontrastu od -100 do 100 (0 znamená žádná hodnota)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Rozlišení pro skenování textu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Rozlišení v bodech na palec, které se má použít při skenování textu."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Rozlišení pro skenování fotografií"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Rozlišení v bodech na palec, které se má použít při skenování fotografií."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Strana stránky ke skenování"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Strana stránky, která se má skenovat."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Složka pro ukládání souborů"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Složka pro ukládání souborů. Pokud není nastaveno, ukládají se standardně do "
+"složky Dokumenty."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Hodnota kvality u komprimace JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Hodnota kvality, která se má používat u komprimace JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Prodleva v milisekundách mezi stránkami"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Prodleva v milisekundách, která se má ponechat mezi stránkami."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Jednoduché skenování"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenujte dokumenty"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_enovat"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Skutečně snadné skenování dokumentů a fotek, které navíc nabízí šikovné "
+"možnosti úprav. Vystřihněte nechtěné části fotografie a očte ji, jestli "
+"jenaopak. Až budete hotovi, výsledek si vytiskněte, převeďte do PDF, nebo "
+"uložte v některém z rozmanité nabídky formátů."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Jednoduché skenování používá jako základ rohraní SANE, aby pokrylo co "
+"největší množství skenerů."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skener na dokumenty"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"scan;skenovat;scanner;skener;flatbed;stolní;plochý;adf;podavač dokumentů;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Jedna _stránka"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Všechny stránky z _podavače"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Zastavit skenování"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Více ručně podávanách stránek"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografie"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_enovat"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zastavit skenování"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Přeskupit stránky"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Oříznout"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "Žád_né"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Vlastní"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Otočit ořez"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Posunout doleva"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Posunout doprava"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Nápověda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Obsah"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Vytvořit nový dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nový"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Naskenovat jednu stránku ze skeneru"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skenovat"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Uložit"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zastavit probíhající skenování"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zastavit"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Otočit doleva"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Otočit doprava"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Oříznout vybranou stránku"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Oříznout"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Předvolby"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Zdroj skenování:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Rozlišení textu:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Rozlišení fotografie:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skenovat stranu:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Velikost stránky:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Jas:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalita:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Skener dokumentu"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Vyhledávají se skenery…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Naskenovat dokumenty"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "Z_avřít"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, 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"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Připraveno ke skenování"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Skutečně snadné skenování dokumentů a fotek, které mimo jiné nabízí šikovné "
-"úpravy. Vystřihněte nechtěné části fotografie a přetočte ji klidně o 360 "
-"stupňů! Až budete hotovy, materiál si nechtě vytisknout, převést do pdf, "
-"nebo uložit v rozmanité škále formátů."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Jsou zapotřebí ovladače skeneru"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Simple Scan používá SANE framework, aby pokryl co největší množství scannerů."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Nelze navázat spojení se skenerem"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Nelze zahájit skenování"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Skenování selhalo"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ZAŘÍZENÍ...] - Nástroj pro skenování"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Spustit příkaz „%s --help“ k zobrazení úplného seznamu dostupných přepínačů "
-"příkazové řádky."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "Z_avřít"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, 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"
+"Potřebujete <a href=\"install-firmware\">nainstalovat ovladače</a> pro svůj "
+"skener."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Nenalezen žádný skener"
+msgstr "Nebyl nalezen žádný skener"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
-msgstr "Zkontrolujte prosím, že je váš skener připojen a zapnut"
-
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Jsou potřeba ovladače scaneru"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Jsou potřeba ovladače scaneru"
+msgstr "Zkontrolujte prosím, že je váš skener připojený a zapnutý"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Uložit jako..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Uložit jako…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Uložit"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Všechny soubory"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (vícestránkový dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (bezeztrátový)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimovaný)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr "Typ souboru:"
+msgstr "Formát souboru:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimace:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Soubor s názvem „%s“ již existuje. Chcete jej nahradit?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "Nah_radit"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Ukládá se"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Uložení souboru selhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Pokud neuložíte, změny budou nenávratně ztraceny."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Pokud dokument neuložíte, změny budou nenávratně ztraceny."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Uložit stávající dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktuje se skener…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Nelze otevřít aplikaci s náhledem obrázku"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinovat strany"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinovat strany (obráceně)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Obrátit"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Zachovat beze změň"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Nelze otevřít soubor s nápovědou"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -529,30 +538,30 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 "Tento program je svobodný software: můžete jej šířit a/nebo upravovat\n"
-"podle ustanovení GNU General Public License vydané\n"
-"Free Software Foundation, buď verze 3 této licence nebo\n"
-"(dle vlastního uvážení) kterékoliv pozdější verze.\n"
+"podle ustanovení licence GNU General Public License vydané organizací\n"
+"Free Software Foundation, buď ve verzi 3 této licence nebo\n"
+"(dle vlastního uvážení) v kterékoliv novější verzi.\n"
 "\n"
 "Tento program je šířen v naději, že bude užitečný, avšak BEZ JAKÉKOLIV\n"
-"ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo\n"
-"VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti hledejte\n"
-"v GNU General Public License.\n"
+"ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI\n"
+"PRO URČITÝ ÚČEL. Další podrobnosti hledejte v licenci GNU General\n"
+"Public License.\n"
 "\n"
-"Kopii GNU General Public License byste měli obdržet spolu s tímto "
-"programem.\n"
-"Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
+"Kopii GNU General Public License byste měli obdržet spolu s tímto\n"
+"programem. Pokud tomu tak není, přečtěte si ji na webové stránce\n"
+"<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -567,401 +576,467 @@ msgstr ""
 "  Vitezslav Kotrla https://launchpad.net/~vitezslav-kotrla\n"
 "  Vojtěch Trefný https://launchpad.net/~vojtech.trefny\n"
 "  Zdeněk Kopš https://launchpad.net/~zdenekkops\n"
-"  la_serpe https://launchpad.net/~tom-mil"
+"  la_serpe https://launchpad.net/~tom-mil\n"
+"  Marek Černocký <marek@manet.cz>"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Vypadá to, že máte scaner Brother"
+msgstr "Vypadá to, že máte skener Brother"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://support.brother.com\">webu "
 "výrobce</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Vypadá to, že máte scaner Samsung"
+msgstr "Vypadá to, že máte skener Samsung"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://samsung.com/support\">webu "
 "výrobce</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Vypadá to, že máte scaner HP."
+msgstr "Vypadá to, že máte skener HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Vypadá to, že máte scaner Epson."
+msgstr "Vypadá to, že máte skener Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Ovladače jsou dostupné na <a href=\"http://support.epson.com\">webu "
-"výrobce</a>."
+"Ovladače jsou dostupné na <a href=\"http://support.epson.com\">webu výrobce</"
+"a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instalace ovladačů"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Po instlaci je potřeba restartovat Simple Scan"
+msgstr "Po instlaci je potřeba Jednoduché skenování restartovat"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Instalace ovladačů..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Instalují se ovladače…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Instalace ovladačů byla úspěšná!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Instalace ovladačů skončila chybou %d"
+msgstr "Instalace ovladačů selhala (kód chyby %d)"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Instalace ovladačů se nezdařila."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
-#, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Je potřeba nainstalovat balík %s."
-
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (výchozí)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/app-window.vala:1454
 #, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (náčrt)"
-
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (vysoké rozlišení)"
-
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nový dokument"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Email..."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Je potřeba nainstalovat balíček %s."
+msgstr[1] "Je potřeba nainstalovat balíčky %s."
+msgstr[2] "Je potřeba nainstalovat balíčky %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Předvolby"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Tisk…"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Klávesové zkratky"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "O aplikaci"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
 msgstr "Ukončit"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Změnit _skener"
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instalovat ovladače"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Spustit znovu…"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automaticky"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Tmavší"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Světlejší"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Oříznout vybranou stránku"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Méně"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Smazat vybranou stránku"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Více"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Zrušit"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizovat"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Uživatelské jméno pro zdroj:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Ukládání dokumentu..."
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Heslo:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Ukládání strany %d z %d"
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+msgid "Unable to encode page %i"
+msgstr "Nelze zakódovat stránku %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skenování"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Naskenovat jednu stránku"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Naskenovat všechny stránky z podavače"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Naskenovat jednu ručně podanou stránku"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zastavit probíhající skenování"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Zkontrolujte prosím svoji instalaci"
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Úpravy dokumentu"
 
-#~ msgid "Files missing"
-#~ msgstr "Soubory chybí"
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Posunout stránku doleva"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Výška skenovaného obrázku v pixelech"
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Posunout stránku doprava"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Směr skenování"
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Rozlišení pro skenování fotografií"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Výška okna v pixelech"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Smazat stránku"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Správa dokumentů"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Začít nový dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Uložit naskenovaný dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Odeslat naskenovaný dokument e-mailem"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Vytisknout naskenovaný dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Zkopírovat aktuální stránku do schránky"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Šířka okna v pixelech"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skener"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Šířka skenovaného obrázku v pixelech"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skenovat strany"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skenovaný dokument"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Velikost stránky:"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "Nastavit na hodnotu PRAVDA, pokud má být okno maximalizované"
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Přední"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Zařízení určené ke skenování"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Zadní"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Zařízení SANE pro načítání obrázků."
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obě"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Prodleva"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Více ručně podávanách stránek"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "sekund"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skenuje se"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Rozlišení pro skenování textu"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Rozlišení _textu"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Rozlišení posledního skenovaného obrázku"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Rozlišení _fotografie"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Adresář pro ukládání souborů"
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Jas"
 
-#~ 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'"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
 
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Výška skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
-#~ "skenované stránce."
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalita"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Rozlišení posledně skenovaného obrázku v bodech na palec."
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automaticky"
 
-#~ 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."
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tmavší"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Typ skenovaného dokumentu"
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Světlejší"
 
-#~ 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í."
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menší"
 
-#~ 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."
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Větší"
 
-#~ 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."
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (výchozí)"
 
-#~ 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í."
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (náčrt)"
 
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
 #, 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+"
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (vysoké rozlišení)"
 
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Použití:\n"
-#~ "  %s [ZAŘÍZENÍ...] - Skenovací nástroj"
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+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.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nelze navázat spojení se skenerem"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nelze zahájit skenování"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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 ladicí zprávy"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Opravit soubory PDF vygenerovaných starší verzí Jednoduchého skenování"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skenování selhalo"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Skenování probíhá"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ZAŘÍZENÍ…] — Nástroj pro skenování"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, 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 "Select File _Type"
-#~ msgstr "Zvolit _typ souboru"
-
-#~ 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í)"
-
-#~ 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)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Výška papíru v desetinách milimetru"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Strana stránky ke skenování"
-
-#~ 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)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Šířka papíru v desetinách milimetru"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Strana stránky ke skenování."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Typ skenovaného dokumentu. Toto nastavení rozhoduje o rozlišení skenování, "
-#~ "barvách a následném zpracování."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Směr skenování stránky."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast skenu"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Jas skenu"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Hodnota kvality u JPEG komprese."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Hodnota kvality u JPEG komprese"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Nastavení kontrastu od -100 do 100 (0 žádná hodnota)."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Nastavení jasu od -100 do 100 (0 žádná hodnota)."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Spuštěním „%s --help“ si zobrazíte úplný seznam dostupných přepínačů "
+"příkazové řádky."
diff --git a/po/da.gmo b/po/da.gmo
deleted file mode 100644
index 857e192..0000000
--- a/po/da.gmo
+++ /dev/null
diff --git a/po/da.po b/po/da.po
index 0d0390f..5dba793 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,519 +1,525 @@
 # Danish translation for simple-scan
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2017 Rosetta Contributors and Canonical Ltd 2017
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-10-10 12:13+0000\n"
-"Last-Translator: AJenbo <anders@jenbo.dk>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-28 18:35+0000\n"
+"PO-Revision-Date: 2017-09-05 20:45+0200\n"
+"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorisér"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Enhed at skanne fra"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Br_ugernavn for ressource:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-enhed at erhverve billeder fra."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Adgangskode:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Dokumenttype der skannes"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "For- og bagside"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Hvilken slags dokument der skannes. Denne indstilling bestemmer opløsning, "
+"farver og efterbehandling."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Forside"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Papirbredde i tiendedele millimeter"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Bagside"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papirbredde i tiendedele millimeter (eller 0 for automatisk registrering)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papirhøjde i tiendedele millimeter"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papirhøjde i tiendedele millimeter (eller 0 for automatisk registrering)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Lysstyrke for skanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Lysstyrkejusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast for skanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrastjusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Opløsning for tekstskan"
 
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Opløsningen i punkter per tomme der skal bruges til skanning af tekst."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Opløsning for billedskan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Opløsningen i punkter per tomme der skal bruges til skanning af billeder."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Papirside der skal skannes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Hvilken side af papiret der skal skannes."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Mappe til at gemme filer i"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitetsværdi der bruges til JPEG-komprimering"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitetsværdi der bruges til JPEG-komprimering."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Forsinkelse i millisekunder mellem sider"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Forsinkelse i millisekunder mellem sider."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simpel skanning"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skan dokumenter"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_an"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"En virkelig nem måde at skanne både dokumenter og billeder på. Du kan beskære "
+"de uønskede dele fra et billede og rotere det, hvis det vender forkert. Du "
+"kan udskrive dine skanninger, eksportere dem til pdf eller gemme dem i en "
+"række billedformater."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simpel skanning bruger SANE-rammeværket for at understøtte flest mulige "
+"skannere."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentskanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;skan;skanner;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Enkelt side"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Alle sider fra _arkføderen"
+msgstr "_Alle sider fra arkføderen"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stop skanning"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Flere sider fra glaspladen"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Billede"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_an"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stop skanning"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Sortér sider påny"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
-msgstr "_Send med e-post"
+msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Rotér mod _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Rotér mod _højre"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Beskær"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Brugertilpasset"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Rotér beskæring"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Flyt til højre"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hjælp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Indhold"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Start et nyt dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nyt"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Skan en enkelt side fra skanneren"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skan"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Gem dokument som en fil"
+msgstr "Gem skanningen som en fil"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Gem"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Stop den igangværende skanning"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stop"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotér siden mod venstre (mod uret)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Rotér mod venstre"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rotér siden mod højre (med uret)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Rotér mod højre"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Beskær den markerede side"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Beskær"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Skanner_kilde:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Tekstopløsning:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Billedopløsning:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skan side:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sidestørrelse:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Lysstyrke:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Søger efter skannere …"
 
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalitet:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentskanner"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Luk"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skan dokumenter"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Brugernavn og adgangskode er krævet for at tilgå “%s”"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;skan;skanner;"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Klar til at skanne"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"En virkelig nem måde at skanne både dokumenter og billeder. Du kan beskære "
-"de uønskede dele fra et billede og rotere det, hvis det vender forkert. Du "
-"kan udskrive dine skanninger, eksportere dem til pdf eller gemme dem i en "
-"række billedformater."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Yderligere software påkrævet"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Simpel skanning bruger SANE-rammeværket for at understøtte flest mulige "
-"skannere."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Kunne ikke forbinde til sḱanner"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Kunne ikke starte skanning"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Skanning mislykkedes"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ENHED...] - Skanningsredskab"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Udfør \"%s --help\" for at se den fulde liste af tilgængelige "
-"kommandolinjetilvalg."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Luk"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Brugernavn og adgangskode er krævet for at tilgå \"%s\""
+"Det er nødvendigt at <a href=\"install-firmware\">installere en driver</a> "
+"til din skanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollér venligst at skanneren er tændt og sluttet til"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Yderligere software påkrævet"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Det er nødvendigt at installere en driver til din skanner."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Gem som..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Gem som …"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Gem"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Billedfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alle filer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidet dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimeret)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimeret)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Filformat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimering:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Filen “%s” findes allerede. Vil du erstatte den?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "E_rstat"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Gemmer"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
-msgstr "Kunne ikke gemme fil"
+msgstr "Kunne ikke gemme filen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Hvis du ikke gemmer, vil ændringer gå permanent tabt."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Hvis du ikke gemmer, vil ændringerne være tabt for altid."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
-msgstr "Gem nuværende dokument?"
+msgstr "Gem det nuværende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontakter skanneren …"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Kan ikke gemme billede for forhåndsvisning"
+msgstr "Kan ikke gemme billedet til forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
-msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
+msgstr "Kan ikke åbne programmet til forhåndsvisning af billeder"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinér sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinér sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Bevar uændret"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
-msgstr "Kan ikke åbne hjælpefil"
+msgstr "Kunne ikke åbne hjælpefilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -542,21 +548,21 @@ msgstr ""
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  AJenbo https://launchpad.net/~ajenbo\n"
-"  Aputsiaĸ Niels Janussen https://launchpad.net/~aj\n"
+"  Aputsiak Niels Janussen https://launchpad.net/~aj\n"
 "  Ask Hjorth Larsen https://launchpad.net/~askhl\n"
 "  David Nielsen https://launchpad.net/~davidnielsen-deactivatedaccount\n"
 "  Joe Hansen https://launchpad.net/~joedalton2\n"
@@ -565,201 +571,514 @@ msgstr ""
 "  Marcus Møller https://launchpad.net/~marcusmoller\n"
 "  Niels Kjøller Hansen https://launchpad.net/~kjoller\n"
 "  TLE https://launchpad.net/~k-nielsen81\n"
-"  Torben Gundtofte-Bruun https://launchpad.net/~torbengb"
+"  Torben Gundtofte-Bruun https://launchpad.net/~torbengb\n"
+"  Alan Mortensen https://launchpad.net/~alanmortensen-am"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Gem dokumentet før der afsluttes?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Du ser ud til at have en Brother skanner."
+msgstr "Du ser ud til at have en Brother-skanner."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Der er drivere er tilgængelige til denne på <a "
-"href=\"http://support.brother.com\">Brothers webside</a>."
+"Drivere til denne kan hentes på <a href=\"http://support.brother.com"
+"\">Brothers websted</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Du ser ud til at have en Samsung-skanner."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Drivere til dette er tilgængelige på <a "
-"href=\"http://samsung.com/support\">Samsungs hjemmeside</a>."
+"Drivere til denne kan hentes på <a href=\"http://samsung.com/support"
+"\">Samsungs websted</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Du ser ud til at have en HP-skanner"
+msgstr "Du ser ud til at have en HP-skanner."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Du ser ud til at have en Epson-skanner"
+msgstr "Du ser ud til at have en Epson-skanner."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Drivere for denne fås på <a href=\"http://support.epson.com\">Epsons "
-"hjemmeside</a>."
+"Drivere til denne kan hentes på <a href=\"http://support.epson.com\">Epsons "
+"websted</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Installér drivere"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Når de er installeret, så skal du genstarte Simpel skanning."
+msgstr "Når de er installeret, skal du genstarte Simpel skanning."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Installerer drivere..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Installerer drivere …"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr "Driver installeret korrekt!"
+msgstr "Driverne blev installeret!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Installation af drivere mislykkedes (fejlkode %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Installation af drivere mislykkedes."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Det er nødvendigt at installere pakken %s."
+msgstr[1] "Det er nødvendigt at installere pakkerne %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tastaturgenveje"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Hjælp"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Om"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Afslut"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Start igen …"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotér siden mod venstre (mod uret)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotér siden mod højre (med uret)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Beskær den markerede side"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Slet den markerede side"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Annullér"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "A_utorisér"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Brugernavn til ressourcen:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Adgangskode:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Det er nødvendigt at installere pakken eller pakkerne %s."
+msgid "Unable to encode page %i"
+msgstr "Kan ikke kode siden %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skanner"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skan en enkelt side"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skan alle sider i arkføderen"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skan kontinuerligt fra en flatbedskanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stop den igangværende skanning"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentændring"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Flyt siden til venstre"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Flyt siden til højre"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotér siden mod venstre (mod uret)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotér siden mod højre (med uret)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Slet siden"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumenthåndtering"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Start et nyt dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gem det skannede dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-mail det skannede dokument"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Udskriv det skannede dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiér den aktuelle side til udklipsholderen"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skanner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skan sider"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Sidestørrelse"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Forside"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Bagside"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Begge"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Forsinkelse"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Flere sider fra glaspladen"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunder"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skanning"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Tekstopløsning"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Billedopløsning"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Lysstyrke"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalitet"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Mørkere"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lysere"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Mindre"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Mere"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høj opløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nyt dokument"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Ingen skannere tilgængelig. Tilslut en skanner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Kan ikke forbinde til sḱanneren"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-post..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Kan ikke starte skanningen"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Udskriv..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Fejl under kommunikation med skanneren"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Hjælp"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Vis versionsnummer"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Om"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Skriv fejlsøgningsbeskeder"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Afslut"
+#: 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 skanning"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Skift _skanner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skanningen mislykkedes"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installér drivere"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Igangværende skanning"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatisk"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ENHED...] — Skanningsværktøj"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Mørkere"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Kør “%s --help” for at se den fulde liste af tilgængelige "
+"kommandolinjetilvalg."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Lysere"
+#~ msgid "Front and Back"
+#~ msgstr "For- og bagside"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Mindre"
+#~ msgid "New"
+#~ msgstr "Nyt"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Mere"
+#~ msgid "Rotate Left"
+#~ msgstr "Rotér mod venstre"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#~ msgid "Rotate Right"
+#~ msgstr "Rotér mod højre"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksimum"
+#~ msgid "Crop"
+#~ msgstr "Beskær"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Gemmer dokument ..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Skanner_kilde:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Gemmer side %d ud af %d"
+#~ msgid "New Document"
+#~ msgstr "Nyt dokument"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Email..."
+#~ msgstr "E-post..."
+
+#~ msgid "Print..."
+#~ msgstr "Udskriv..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Installér drivere"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimum"
+
+#~ msgid "Maximum"
+#~ msgstr "Maksimum"
+
+#~ msgid "Saving document..."
+#~ msgstr "Gemmer dokument ..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Gemmer side %d ud af %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -773,19 +1092,17 @@ msgstr "Gemmer side %d ud af %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Vælg fil_type"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Enhed at skanne fra"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Skanneretning"
 
 #~ 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'"
+#~ "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\""
+#~ "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 "Height of scanned image in pixels"
 #~ msgstr "Højde af skannet billede i pixel"
@@ -800,40 +1117,21 @@ msgstr "Gemmer side %d ud af %d"
 #~ "Højden af skannede billede i pixel. Denne værdi opdateres svarende til "
 #~ "sidste skannede side."
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-enhed at erhverve billeder fra."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Opløsning for tekstskan"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Opløsning for billedskan"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Opløsningen af det sidste billede der blev skannet"
 
 #~ 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."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Mappe til at gemme filer i"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type af dokument der bliver skannet"
-
-#~ 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."
+#~ "Type af dokument der skannes. “text” for tekst dokumenter, “photo” for "
+#~ "billeder. Denne indstilling træffer valget for skanningsopløsning, farver "
+#~ "og efterbehandling."
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
@@ -841,18 +1139,9 @@ msgstr "Gemmer side %d ud af %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Opløsningen i punkter per tomme, på det forrige skannede billede."
 
-#~ 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."
-
-#~ 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."
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Bredde af skannet billede i pixel"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -868,7 +1157,6 @@ msgstr "Gemmer side %d ud af %d"
 #~ "  --help-all                      Vis hjælp for alle tilvalg\n"
 #~ "  --help-gtk                      Vis tilvalg for GTK+"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -876,7 +1164,6 @@ msgstr "Gemmer side %d ud af %d"
 #~ "Brug:\n"
 #~ "  %s [ENHED...] - Skanningsværktøj"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -898,69 +1185,17 @@ msgstr "Gemmer side %d ud af %d"
 #~ "  --gtk-module=MODULER            Indlæs ekstra GTK+-moduler\n"
 #~ "  --g-fatal-warnings              Gør alle advarsler fatale"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skannet dokument"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "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'"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Papirside der skal skannes"
-
-#~ 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)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Højde af papir i tiendedele millimeter"
-
-#~ 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)"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Bredde af papir i tiendedele millimeter"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Vindueshøjde i pixel"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Vinduesbredde i pixel"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Hvilken side af papiret der skal skannes."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Hvilken slags dokument der skal skannes. Denne indstilling bestemmer "
-#~ "opløsningen, farver og efterbehandling."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skannerens retning hen over siden."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrastjusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Lysstyrkejusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kvalitetsværdi der bruges til JPEG-komprimering."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kvalitetsværdi der bruges til JPEG-komprimering"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Lysstyrke for skanning"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast for skanning"
diff --git a/po/de.gmo b/po/de.gmo
deleted file mode 100644
index 8ec1a62..0000000
--- a/po/de.gmo
+++ /dev/null
diff --git a/po/de.po b/po/de.po
index 2c52497..ba318d6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,525 +1,574 @@
 # German 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.
+#
+# Launchpad Contributions:
+# .daniel. https://launchpad.net/~faessje
+# Alexander Wilms https://launchpad.net/~alexander-wilms
+# Alvaro Aleman https://launchpad.net/~alvaroaleman
+# Charon https://launchpad.net/~markus-lobedann
+# Daniel Schury https://launchpad.net/~surst
+# Daniel Winzen https://launchpad.net/~q-d
+# Dennis Baudys https://launchpad.net/~thecondordb
+# Dennisgamer https://launchpad.net/~dennis-ertelt
+# Dominik Grafenhofer https://launchpad.net/~dpjg
+# EgLe https://launchpad.net/~egle1
+# Ettore Atalan https://launchpad.net/~atalanttore
+# Felix https://launchpad.net/~apoapo
+# Franz E. https://launchpad.net/~franzellendorff
+# Funky Future https://launchpad.net/~funky-future
+# Ghenrik https://launchpad.net/~ghenrik-deactivatedaccount
+# HOMBRESINIESTRO https://launchpad.net/~hombre
+# Hendrik Brandt https://launchpad.net/~heb
+# Hendrik Knackstedt https://launchpad.net/~hennekn
+# Jan https://launchpad.net/~jancborchardt-deactivatedaccount
+# John Doe https://launchpad.net/~jodo-deactivatedaccount
+# Julian Gehring https://launchpad.net/~julian-gehring
+# Jörg BUCHMANN https://launchpad.net/~jorg-buchmann
+# Lars Vopicka https://launchpad.net/~lars+vopicka-deactivatedaccount
+# Marcel Schmücker https://launchpad.net/~versus666-deactivatedaccount
+# Martin Lettner https://launchpad.net/~m.lettner
+# Mathias Dietrich https://launchpad.net/~theghost
+# Moritz Baumann https://launchpad.net/~mo42
+# Phillip Sz https://launchpad.net/~phillip-sz
+# Raphael J. Schmid https://launchpad.net/~raphael-j-schmid
+# Scherbruch https://launchpad.net/~scherbruch
+# Stefan Buchholz https://launchpad.net/~stef-buchholz
+# Steve G. https://launchpad.net/~sgo.ger
+# Thomas Heidrich https://launchpad.net/~gnuheidix
+# Tobias Bannert https://launchpad.net/~toba
+# Torsten Franz https://launchpad.net/~torsten.franz
+# UweS https://launchpad.net/~uwes
+# Webschiff https://launchpad.net/~webschiff
+# William Glover https://launchpad.net/~williamglover
+# schuko24 https://launchpad.net/~gerd-saenger
+# staedtler-przyborski https://launchpad.net/~staedtler-przyborski
+# tlue https://launchpad.net/~tlueber"
+#
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2015-01-16 18:30+0000\n"
-"Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"
-"Language-Team: German <de@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-19 13:54+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Legitimieren"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Scangerät"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Benutzername für Quelle:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-Gerät, von dem Bilder angefordert werden."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Passwort:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Typ des zu scannenden Dokuments"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Vorder- und Rückseite"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ des zu scannenden Dokuments. Diese Einstellung entscheidet über die "
+"Auflösung, Farben und Nachbearbeitung."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Vorderseite"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Seitenbreite in Zehntelmillimetern"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Rückseite"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papierhöhe in Zehntelmillimetern"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height 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)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Helligkeit des Scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Helligkeitseinstellung von -100 bis 100 (0 keine)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast des Scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Auflösung von Text-Scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Auflösung von Foto-Scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Zu scannende Seite des Blattes"
 
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Die zu scannende Seite."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Ordner, in dem die Dateien gespeichert werden"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Der Ordner, in dem die Dateien gespeichert werden. Vorgabe ist der "
+"»Dokumente«-Ordner, wenn nichts eingestellt ist."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Qualitätswert für die JPEG-Komprimierung"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Qualitätswert, der für die JPEG-Komprimierung verwendet werden soll."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Verzögerung zwischen Seiten in Millisekunden"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Verzögerung zwischen Seiten in Millisekunden."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Dokumente scannen"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sc_annen"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Eine ganz einfache Methode, um sowohl Dokumente als auch Fotos zu scannen. "
+"Unbrauchbare Teile eines Fotos können abgeschnitten werden, es kann gedreht "
+"werden, falls es verkehrt herum liegt. Die Scans können gedruckt, als PDF-"
+"Dokument exportiert oder in einer Anzahl verschiedener Bildformate "
+"gespeichert werden."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan verwendet das SANE-Framework für die Unterstützung der meisten "
+"verfügbaren Scanner."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokument-Scanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;einlesen;scanner;Flachbett;flatbed;AVW;Vorlagenwechsler;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Einzelne Seite"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Alle Seiten aus dem _Papiereinzug"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Scanvorgang anhalten"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Mehrere Seiten aus Flachbett"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sc_annen"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Scanvorgang anhalten"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Seiten umsortieren"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-Mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Seite"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "_Links herum drehen"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "_Rechts herum drehen"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Zuschneiden"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nicht zuschneiden"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6 Zoll"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Zuschneideauswahl _drehen"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Nach links schieben"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Nach rechts schieben"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "I_nhalt"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Neues Dokument erstellen"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Neu"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Eine einzelne Seite vom Scanner einscannen"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Als Datei speichern"
+msgstr "Dokument als Datei speichern"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Speichern"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Aktuellen Scanvorgang unterbrechen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Anhalten"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Die Seite links herum drehen (Gegen den Uhrzeigersinn)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Links herum drehen"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Die Seite rechts herum drehen (Im Uhrzeigersinn)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Rechts herum drehen"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Die gewählte Seite zurechtschneiden"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Zuschneiden"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Scan-_Quelle:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Textauflösung:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotoauflösung:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Zu scannende Seite:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Seitengröße:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Helligkeit:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualität:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokument-Scanner"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Dokumente scannen"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Nach Scannern wird gesucht …"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;einlesen;scanner;Flachbrett;flatbed;AVW;Vorlagenwechsler;adf;"
-
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Eine ganz einfache Methode, um sowohl Dokumente als auch Fotos zu scannen. "
-"Unbrauchbare Teile eines Fotos können abgeschnitten werden, es kann gedreht "
-"werden, falls es verkehrt herum liegt. Die Scans können gedruckt, als PDF-"
-"Dokument exportiert oder in einer Anzahl verschiedener Bildformate "
-"gespeichert werden."
-
-#: data/simple-scan.appdata.xml.in:13
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan verwendet das SANE-Programmiergerüst für die Unterstützung der "
-"meisten verfügbaren Scanner."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Verbindung zum Scanner konnte nicht hergestellt werden"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Scanvorgang konnte nicht gestartet werden"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Scannen fehlgeschlagen"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[GERÄT …] - Scan-Werkzeug"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren "
-"Befehlszeileoptionen zu erhalten."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/app-window.vala:237 src/app-window.vala:1380
 msgid "_Close"
 msgstr "S_chließen"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
 #, c-format
-msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
 msgstr ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Bereit zum Scannen"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Zusätzliche Software wird benötigt"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+"Sie müssen die <a href=\"install-firmware\">Treibersoftware</a für Ihren "
+"Scanner installieren."
+
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Zusätzliche Software wird benötigt"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Sie müssen die Treibersoftware für Ihren Scanner installieren"
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Speichern unter …"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Speichern"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Bilddateien"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (Mehrseitiges Dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (Verlustbehaftet)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimiert)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Dateiformat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Kompression:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Eine Datei namens »%s« existiert bereits. Möchten Sie diese ersetzen?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "E_rsetzen"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Wird gespeichert"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Scanner wird kontaktiert …"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Vorschaubild kann nicht gespeichert werden"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Seiten zusammenfügen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Seiten zusammenfügen (umgekehrte Reihenfolge)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Vertauschen"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Unverändert lassen"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -553,16 +602,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -609,400 +658,464 @@ msgstr ""
 "  tlue https://launchpad.net/~tlueber"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Scheinbar ist ein Brother Scanner angeschlossen."
+msgstr "Scheinbar ist ein Brother-Scanner angeschlossen."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Treiber hierfür sind verfügbar auf der <a "
-"href=\"http://support.brother.com\">Brother Webseite</a>."
+"Treiber hierfür sind verfügbar auf der <a href=\"http://support.brother.com"
+"\">Brother Webseite</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Scheinbar ist ein Samsung Scanner angeschlossen."
+msgstr "Scheinbar ist ein Samsung-Scanner angeschlossen."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Treiber hierfür sind verfügbar auf der <a "
-"href=\"http://samsung.com/support\">Samsung Webseite</a>."
+"Treiber hierfür sind verfügbar auf der <a href=\"http://samsung.com/support"
+"\">Samsung Webseite</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Scheinbar ist ein HP Scanner angeschlossen."
+msgstr "Scheinbar ist ein HP-Scanner angeschlossen."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Scheinbar ist ein Epson Scanner angeschlossen."
+msgstr "Scheinbar ist ein Epson-Scanner angeschlossen."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Treiber hierfür sind auf der <a href=\"http://support.epson.com\">Epson "
 "Webseite</a> verfügbar."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Treiber installieren"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Nach der Installation müssen Simple Scan erneut starten."
+msgstr "Nach der Installation müssen Sie Simple Scan erneut starten."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Treiber werden installiert…"
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Treiber werden installiert …"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Treiber wurden erfolgreich installiert!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Treiberinstallation fehlgeschlagen (Fehlernummer %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Treiberinstallation fehlgeschlagen."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Sie müssen %s Paket(e) installieren."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Sie müssen das Paket %s installieren."
+msgstr[1] "Sie müssen die Pakete %s installieren."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Einstellungen"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (Vorgabe)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tastenkombinationen"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (Entwurf)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Hilfe"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (Hohe Auflösung)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Info"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Beenden"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-Mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Erneut starten …"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Die Seite links herum drehen (gegen den Uhrzeigersinn)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Die Seite rechts herum drehen (im Uhrzeigersinn)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Die gewählte Seite zurechtschneiden"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Die gewählte Seite löschen"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Legitimieren"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Benutzername für Quelle:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Passwort:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+msgid "Unable to encode page %i"
+msgstr "Seite %i konnte nicht kodiert werden"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Neues Dokument"
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Scannen"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Eine einzelne Seite vom Scanner einscannen"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-Mail …"
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Alle Seiten aus dem Dokumenteneinzug einscannen"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Fortlaufend vom Flachbett-Scanner einscannen"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Laufenden Scanvorgang anhalten"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentbearbeitung"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Nach links schieben"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Drucken …"
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Nach rechts schieben"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Hilfe"
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Die Seite links herum drehen (gegen den Uhrzeigersinn)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Die Seite rechts herum drehen (im Uhrzeigersinn)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Seite löschen"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumentenverwaltung"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Neues Dokument beginnen"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gescanntes Dokument speichern"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Gescanntes Dokument per E-Mail versenden"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Gescanntes Dokument drucken"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Aktuelle Seite in die Zwischenablage kopieren"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Über"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Scanner"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Beenden"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Zu scannende Seiten"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Seitengröße"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Vorderseite"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "_Scanner wechseln"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Rückseite"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Beide"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Verzögerung"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Mehrere Seiten aus Flachbett"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunden"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Scannen"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Textauflösung"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Treiber installieren"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Fotoauflösung"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Helligkeit"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualität"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Dunkler"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Heller"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Weniger"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Niedrig"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (Vorgabe)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Hoch"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (Entwurf)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Dokument wird gespeichert …"
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (Hohe Auflösung)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Seite %d von %d wird gespeichert"
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Keine Scanner verfügbar. Bitte schließen Sie einen Scanner an."
 
-#~ msgid "Files missing"
-#~ msgstr "Dateien nicht gefunden"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Verbindung zum Scanner konnte nicht hergestellt werden"
 
-#, 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 "Please check your installation"
-#~ msgstr "Bitte überprüfen Sie Ihre Installation"
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Fensterhöhe in Pixel"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Fensterbreite in Pixel"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Gescanntes Dokument"
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Höhe des gescannten Bilds in Pixel"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Scangerät"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-Gerät, von dem Bilder angefordert werden."
-
-#~ msgid "Direction of scan"
-#~ msgstr "Scanverzeichnis"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Auflösung von Text-Scans"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Auflösung von Foto-Scans"
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Auflösung des zuletzt gescannten Bildes"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Verzeichnis, in dem die Dateien gespeichert werden"
-
-#~ 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«"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Typ des zu scannenden Dokuments"
-
-#~ 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."
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Die Höhe des gescannten Bilds in Pixel. Der Wert wird entsprechend der "
-#~ "zuletzt gescannten Seite übernommen."
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "TRUE wenn das Anwendungsfenster maximiert ist"
-
-#~ 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."
-
-#~ 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)"
-
-#~ 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)"
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Breite des gescannten Bilds in Pixel"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Scanvorgang konnte nicht gestartet werden"
 
-#, 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"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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 ""
+"PDF-Dateien reparieren, die mit einer älteren Version von Simpe Scan "
+"erstellt wurden"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Scannen fehlgeschlagen"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Scanvorgang läuft"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[GERÄT …] — Scan-Werkzeug"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Verwendung:\n"
-#~ "  %s [GERÄT...] - Scanwerkzeug"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Zu scannende Seite des Blattes"
-
-#~ msgid ""
-#~ "The height 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)"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Papierhöhe in Zehntelmillimetern"
-
-#~ 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)"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Seitenbreite in Zehntelmillimetern"
-
-#~ 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."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Typ des zu scannenden Dokuments. Diese Einstellung entscheidet über die "
-#~ "Auflösung, Farben und Nachbearbeitung."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Die zu scannende Seite."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Die Richtung des Scanners über die gescannte Seite."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrasteinstellung von -100 bis 100 (0 keine)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast des Scans"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Helligkeitseinstellung von -100 bis 100 (0 keine)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Helligkeit des Scans"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Qualitätswert, der für die JPEG-Komprimierung verwendet werden soll."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Qualitätswert für die JPEG-Komprimierung"
-
-#~ 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 der "
-#~ "»Dokumente«-Ordner, wenn nichts eingestellt ist."
-
-#~ msgid "Select File _Type"
-#~ msgstr "_Dateityp auswählen"
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren "
+"Befehlszeilenoptionen zu erhalten."
diff --git a/po/el.gmo b/po/el.gmo
deleted file mode 100644
index 594f02d..0000000
--- a/po/el.gmo
+++ /dev/null
diff --git a/po/el.po b/po/el.po
index ede25bb..54752ad 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,513 +5,529 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 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"
+"Project-Id-Version: simple-scan:el\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-23 13:09+0000\n"
+"PO-Revision-Date: 2017-10-05 12:19+0300\n"
+"Last-Translator: Tom Tryfonidis <tomtryf@gnome.org>\n"
+"Language-Team: Greek <team@gnome.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Εξουσιοδότηση"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Όνομα _χρήστη για πόρο:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Συσκευή SANE που χρησιμοποιείται για την λήψη εικόνων."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Κωδικός:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Ο τύπος του εγγράφου που σαρώνεται"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Πρόσοψη και πίσω όψη"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Ο τύπος του έγγραφου που σαρώνεται.  Αυτή η ρύθμιση καθορίζει την ανάλυση, "
+"το χρώμα και την μετα-επεξεργασία της σάρωσης."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Πρόσοψη"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm)"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Πίσω όψη"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Ύψος σελίδας σε δέκατα του χιλιοστού (mm)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"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:35
+msgid "Brightness of scan"
+msgstr "Φωτεινότητα σάρωσης"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Προσαρμογή της φωτεινότητας από -100 έως 100 (0 χωρίς προσαρμογή)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Αντίθεση σάρωσης"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Προσαρμογή της αντίθεσης από -100 έως 100 (0 χωρίς προσαρμογή)"
 
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Ανάλυση για σάρωση κειμένου"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση κειμένων."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Ανάλυση για σάρωση φωτογραφιών"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση "
+"φωτογραφιών."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Πλευρά σελίδας για σάρωση"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Η πλευρά της σελίδας για σάρωση."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Ο κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία. Αν δεν ορισθεί, προεπιλογή "
+"είναι ο κατάλογος εγγράφων."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Καθυστέρηση ανάμεσα στις σελίδες, σε χιλιοστά του δευτερολέπτου"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Καθυστέρηση ανάμεσα στις σελίδες, σε χιλιοστά του δευτερολέπτου."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Σάρωση"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Έγγραφο"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Σάρωση εγγράφων"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "_Σάρωση"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Ένας πραγματικά εύκολος τρόπος σάρωσης εγγράφων και εικόνων. Μπορείτε να "
+"κάνετε περικοπή των κακών κομματιων μιας φωτογραφίας και  να την "
+"περιστρέψετε εφόσον χρειάζεται. Μπορείτε να εκτυπώσετε τις σαρώσεις σας, να "
+"τις εξάγετε ως pdf, ή να τις σώσετε ως αρχειο εικόνας."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Το Simple Scan χρησιμοποιεί το πλαίσιο SANE ώστε να υποστηρίζει τους "
+"περισσότερους σαρωτές."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Σαρωτής εγγράφων"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;σάρωση;σαρωτής;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Μια_σελίδα"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Όλες τις σελίδες από την _τροφοδοσία"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Διακοπή σάρωσης"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Πολλαπλές σελίδες από την επιφάνεια σάρωσης"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "ΚΕΙΜΕΝΟ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Φωτογραφία"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Έγγραφο"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Σάρωση"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Διακοπή σάρωσης"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Επαναδιάταξη σελίδων"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
-msgstr "_Email"
+msgstr "Ηλ. _αλληλογγραφία"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Σελίδα"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Περιστροφή _αριστερά"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Περιστροφή _δεξιά"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Περικοπή"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Κανένα"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6 ίντσες"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Προσαρμοσμένο"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Περιστροφή περικοπής"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Μετακίνηση αριστερά"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Μετακίνηση δεξιά"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Βοήθεια"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Δημιουργία νέου εγγράφου"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Νέο"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Σάρωση μίας σελίδας από τον σαρωτή"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Σάρωση"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Αποθήκευση"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Διακοπή τρέχουσας σάρωσης"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Διακοπή"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Περιστροφή της σελίδας αριστερά"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Περιστροφή αριστερά"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Περιστροφή της σελίδας δεξιά"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Περιστροφή δεξιά"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Περικοπή της επιλεγμένης σελίδας"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Περικοπή"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Προτιμήσεις"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Αναζήτηση για σαρωτές…"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Πηγή σάρωσης:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Ανάλυση _κειμένου:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Ανάλυση _φωτογραφίας:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Πλευρά σάρωσης"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Μέγεθος σελίδας:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Φωτεινότητα:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Αντίθεση:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Ποιότητα:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Σαρωτής εγγράφων"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Σάρωση εγγράφων"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Κλείσιμο"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Έτοιμο για σάρωση"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Απαιτείται επιπρόσθετο λογισμικό"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Δεν υπάρχουν διαθέσιμοι σαρωτές. Παρακαλούμε συνδέστε ένα σαρωτή."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Αδύνατη η σύνδεση με τον σαρωτή"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Αδύνατη η εκκίνηση της σάρωσης"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Διόρθωση αρχείων PDF που δημιουργήθηκαν με παλαιότερες εκδόσεις του "
-"λογισμικού Simple Scan"
-
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "Η σάρωση απέτυχε"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ΣΥΣΚΕΥΗ…] - Εφαρμογή σάρωσης"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
-"εντολής γραμμής."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο '%s'"
+"Χρειάζεται να <a href=\"install-firmware\">εγκαταστήσετε οδηγό υλικού</a> "
+"για τον σαρωτή σας."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Αποθήκευση ως..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Αποθήκευση ως…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "Απο_θήκευση"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (συμπιεσμένο)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (συμπιεσμένο)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Τύπος αρχείου:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Συμπίεση:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Υπάρχει ήδη αρχείο με το όνομα «%s». Θέλετε να αντικατασταθεί;"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Αντικατάσταση"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Γίνεται αποθήκευση…"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Αποτυχία αποθήκευσης του αρχείου"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Απόρριψη αλλαγών"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Αναζήτηση σαρωτή…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
-msgstr ""
+msgstr "Συνδυασμός πλευρών"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Συνδυασμός πλευρών (αντιστροφή)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr ""
+msgstr "Αντιστροφή"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Διατήρηση αμετάβλητων"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -543,16 +559,16 @@ msgstr ""
 "εδώ: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -573,192 +589,509 @@ msgstr ""
 "  trix https://launchpad.net/~panelc"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
-msgstr "Έξοδος χωρίς Αποθήκευση"
+msgstr "Έξοδος χωρίς αποθήκευση"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Φαίνεται να έχετε έναν σαρωτή Brother"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"Οι οδηγοί για αυτόν είναι διαθέσιμοι στον <a href=\"http://support.brother."
+"com\">ιστότοπο της Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Φαίνεται να έχετε έναν σαρωτή Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"Οι οδηγοί για αυτόν είναι διαθέσιμοι στον <a href=\"http://samsung.com/"
+"support\">ιστότοπο της Samsung </a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Φαίνεται να έχετε έναν σαρωτή HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Φαίνεται να έχετε έναν σαρωτή Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
+"Οι οδηγοί για αυτόν είναι διαθέσιμοι στον <a href=\"http://support.epson.com"
+"\">ιστότοπο της Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Εγκατάσταση οδηγών"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Όταν εγκατασταθούν θα πρέπει να γίνει επανεκκίνηση του Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Εγκαθίστανται οι οδηγοί…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Οι οδηγοί εγκαταστάθηκαν επιτυχώς!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Αποτυχία εγκατάστσης οδηγών (κωδικός σφάλματος %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Αποτυχία εγκατάστασης οδηγών."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Χρειάζεται να εγκαταστήσετε το %s πακέτο."
+msgstr[1] "Χρειάζεται να εγκαταστήσετε τα %s πακέτα."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Προτιμήσεις"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Συντομεύσεις πληκτρολογίου"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Βοήθεια"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Περί"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "'Εξοδος"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Ηλεκτρονική αλληλογραφία"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Εκκίνηση πάλι…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Περιστροφή της σελίδας αριστερά"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Περιστροφή της σελίδας δεξιά"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Περικοπή της επιλεγμένης σελίδας"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Διαγραφή της επιλεγμένης σελίδας"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Εξουσιοδότηση"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Όνομα _χρήστη για πόρο:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Κωδικός:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Αδύνατη η κωδικοποίηση της σελίδας %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Γίνεται σάρωση"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Σάρωση μίας σελίδας "
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Σάρωση όλων των σελίδων από την τροφοδοσία εγγράφων"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Σάρωση συνεχώς από έναν σαρωτή επίπεδης επιφάνειας"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Διακοπή σάρωσης σε πρόοδο"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "τροποποίηση εγγράφων"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Μετακίνηση σελίδας αριστερά"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Μετακίνηση σελίδας δεξιά"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Περιστροφή της σελίδας αριστερά (ανάποδα από τη φορά του ρολογιού)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Περιστροφή της σελίδας δεξιά (φορά του ρολογιού)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Διαγραφή σελίδας"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Διαχείριση εγγράφων"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Δημιουργία νέου εγγράφου"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Αποθήκευση σαρωμένου εγγράφου"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Αποστολή σαρωμένου εγγράφου με ηλ. αλληλογραφία"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Εκτύπωση σαρωμένου εγγράφου"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Αντιγραφή της τρέχουσας σελίδας στο παρασκήνιο"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Σαρωτής"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Πλευρές σάρωσης"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Μέγεθος σελίδας"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Πρόσοψη"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Πίσω όψη"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Μπρος - πίσω"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Καθυστέρηση"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Πολλαπλές σελίδες από την επιφάνεια σάρωσης"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Δευτερόλεπτα"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Σάρωση"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Ανάλυση _κειμένου"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Ανάλυση _φωτογραφίας"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Φωτεινότητα"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Αντίθεση"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Ποιότητα"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Αυτόματο"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Σκοτεινότερο"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Φωτεινότερο"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Λιγότερο"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Περισσότερο"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Νέο έγγραφο"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Δεν υπάρχουν διαθέσιμοι σαρωτές. Παρακαλούμε συνδέστε ένα σαρωτή."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Έγγραφο"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Αδύνατη η σύνδεση με τον σαρωτή"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Ηλεκτρονική αλληλογραφία..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Αδύνατη η εκκίνηση της σάρωσης"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Εκτύπωση..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Σφάλμα κατά την επικοινωνία με τον σαρωτή"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Βοήθεια"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Προβολή αριθμού έκδοσης"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Περί"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Εμφάνιση μηνυμάτων εντοπισμού σφαλμάτων"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-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.vala:392
+msgid "Failed to scan"
+msgstr "Η σάρωση απέτυχε"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Αλλαγή _σαρωτή"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Γίνεται σάρωση"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ΣΥΣΚΕΥΗ…] — Εργαλείο σάρωσης"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
+"Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
+"της γραμμής εντολών."
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Αυτόματο"
+#~ msgid "Front and Back"
+#~ msgstr "Πρόσοψη και πίσω όψη"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Σκοτεινότερο"
+#~ msgid "New"
+#~ msgstr "Νέο"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Φωτεινότερο"
+#~ msgid "Rotate Left"
+#~ msgstr "Περιστροφή αριστερά"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Λιγότερο"
+#~ msgid "Rotate Right"
+#~ msgstr "Περιστροφή δεξιά"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Περισσότερο"
+#~ msgid "Crop"
+#~ msgstr "Περικοπή"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Ελάχιστο"
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Πηγή σάρωσης:"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Μέγιστο"
+#~ msgid "New Document"
+#~ msgstr "Νέο έγγραφο"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Αποθήκευση εγγράφου..."
+#~ msgid "Document"
+#~ msgstr "Έγγραφο"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Αποθήκευση σελίδας %d από %d"
+#~ msgid "Email..."
+#~ msgstr "Ηλεκτρονική αλληλογραφία..."
+
+#~ msgid "Print..."
+#~ msgstr "Εκτύπωση..."
+
+#~ msgid "Minimum"
+#~ msgstr "Ελάχιστο"
+
+#~ msgid "Maximum"
+#~ msgstr "Μέγιστο"
+
+#~ msgid "Saving document..."
+#~ msgstr "Αποθήκευση εγγράφου..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Αποθήκευση σελίδας %d από %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -772,52 +1105,34 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ msgid "Direction of scan"
 #~ msgstr "Κατεύθυνση σάρωσης"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Ανάλυση για σάρωση κειμένου"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Ανάλυση για σάρωση φωτογραφιών"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Ανάλυση τελευταίας σαρωμένης εικόνας"
 
-#~ msgid "Type of document being scanned"
-#~ 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 ""
-#~ "Ο τύπος του εγγράφου που σαρώνεται. 'text' για έγγραφα κειμένου, 'photo' για "
-#~ "φωτογραφίες. Αυτή η ρύθμιση καθορίζει την ανάλυση σάρωσης, τα χρώματα και τη "
-#~ "μετέπειτα επεξεργασία."
+#~ "Ο τύπος του εγγράφου που σαρώνεται. 'text' για έγγραφα κειμένου, 'photo' "
+#~ "για φωτογραφίες. Αυτή η ρύθμιση καθορίζει την ανάλυση σάρωσης, τα χρώματα "
+#~ "και τη μετέπειτα επεξεργασία."
 
 #~ msgid "Window height in pixels"
 #~ msgstr "Ύψος παραθύρου σε εικονοστοιχεία"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "Το πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται "
-#~ "με το πλάτος της τελευταίας σαρωμένης σελίδας."
+#~ "Το πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή "
+#~ "ενημερώνεται με το πλάτος της τελευταίας σαρωμένης σελίδας."
 
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Το ύψος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται με "
-#~ "το ύψος της τελευταίας σαρωμένης σελίδας."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση κειμένων."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση "
-#~ "φωτογραφιών."
+#~ "Το ύψος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται "
+#~ "με το ύψος της τελευταίας σαρωμένης σελίδας."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία"
@@ -825,7 +1140,6 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Πλάτος παραθύρου σε εικονοστοιχεία"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -833,7 +1147,6 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "Χρήση:\n"
 #~ "  %s [ΣΥΣΚΕΥΗ...] - Εφαρμογή σάρωσης"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -859,24 +1172,19 @@ msgstr "Αποθήκευση σελίδας %d από %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'"
+#~ "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 "SANE device to acquire images from."
-#~ msgstr "Συσκευή SANE που χρησιμοποιείται για την λήψη εικόνων."
-
-#~ msgid "Device to scan from"
-#~ msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
+#~ "κάποιο από τα εξής: 'top-to-bottom' (από πάνω προς τα κάτω) 'bottom-to-"
+#~ "top' (από κάτω προς τα πάνω) 'left-to-right' (από αριστερά προς δεξιά) "
+#~ "'right-to-left' (από δεξιά προς αριστερά)"
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Η ανάλυση σε κουκκίδες ανά ίντσα της προηγούμενης σαρωμένης εικόνας."
+#~ msgstr ""
+#~ "Η ανάλυση σε κουκκίδες ανά ίντσα της προηγούμενης σαρωμένης εικόνας."
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -889,77 +1197,15 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 #~ msgstr ""
 #~ "Επιλογές GTK+:\n"
-#~ "  --class=CLASS                   Κλάση προγράμματος χρησιμοποιούμενη από το "
-#~ "διαχειριστή παραθύρων\n"
-#~ "  --name=NAME                     Όνομα προγράμματος χρησιμοποιούμενο από το "
-#~ "διαχειριστή παραθύρων\n"
+#~ "  --class=CLASS                   Κλάση προγράμματος χρησιμοποιούμενη από "
+#~ "το διαχειριστή παραθύρων\n"
+#~ "  --name=NAME                     Όνομα προγράμματος χρησιμοποιούμενο από "
+#~ "το διαχειριστή παραθύρων\n"
 #~ "  --screen=SCREEN                 Οθόνη X προς χρήση\n"
 #~ "  --sync                          Να είναι σύγχρονες οι κλήσεις στο X\n"
 #~ "  --gtk-module=MODULES            Φόρτωση πρόσθετων αρθρωμάτων GTK+\n"
-#~ "  --g-fatal-warnings              Να είναι όλες οι προειδοποιήσεις μοιραίες"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Σαρωμένο"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Ο κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία. Αν δεν ορισθεί, προεπιλογή "
-#~ "είναι ο κατάλογος εγγράφων."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Πλευρά σελίδας για σάρωση"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Η πλευρά της σελίδας για σάρωση."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Ο τύπος του έγγραφου που σαρώνεται.  Αυτή η ρύθμιση καθορίζει την ανάλυση, "
-#~ "το χρώμα και την μετα-επεξεργασία της σάρωσης."
+#~ "  --g-fatal-warnings              Να είναι όλες οι προειδοποιήσεις "
+#~ "μοιραίες"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Ο προσανατολισμός του σαρωτή  στη σαρωμένη σελίδα"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
-#~ "ανίχνευση χαρτιού)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm)"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Ύψος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
-#~ "ανίχνευση χαρτιού)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Ύψος σελίδας σε δέκατα του χιλιοστού (mm)"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Αντίθεση σάρωσης"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Φωτεινότητα σάρωσης"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Προσαρμογή της αντίθεσης από -100 έως 100 (0 χωρίς προσαρμογή)"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Προσαρμογή της φωτεινότητας από -100 έως 100 (0 χωρίς προσαρμογή)"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG"
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
deleted file mode 100644
index fedb6a0..0000000
--- a/po/en@boldquot.header
+++ /dev/null
@@ -1,25 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
-# This catalog furthermore displays the text between the quotation marks in
-# bold face, assuming the VT100/XTerm escape sequences.
-#
diff --git a/po/en@quot.header b/po/en@quot.header
deleted file mode 100644
index a9647fc..0000000
--- a/po/en@quot.header
+++ /dev/null
@@ -1,22 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
deleted file mode 100644
index 3400101..0000000
--- a/po/en_GB.gmo
+++ /dev/null
diff --git a/po/en_GB.po b/po/en_GB.po
index c956c58..7b79d00 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,516 +2,532 @@
 # 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.
+# Bruce Cowan <bruce@bcowan.eu>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 08:58+0000\n"
-"Last-Translator: James Thorrold <j.thorrold@virgin.net>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-07 03:20+0000\n"
+"PO-Revision-Date: 2017-09-08 11:58+0100\n"
+"Last-Translator: Bruce Cowan <bruce@bcowan.eu>\n"
+"Language-Team: British English <en@li.org>\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Authorise"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Device to scan from"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Username for resource:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE device to acquire images from."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Password:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Type of document being scanned"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Front and Back"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+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, "
+"colours and post-processing."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Front"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Width of paper (in tenths of a mm)"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Back"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Height of paper (in tenths of a mm)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+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:35
+msgid "Brightness of scan"
+msgstr "Brightness of scan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+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:40
+msgid "Contrast of scan"
+msgstr "Contrast of scan"
 
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Resolution for text scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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:50
+msgid "Resolution for photo scans"
+msgstr "Resolution for photo scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Page side to scan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "The page side to scan."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directory to save files to"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Quality value to use for JPEG compression"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Quality value to use for JPEG compression."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Delay in millisecond between pages"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Delay in millisecond between pages."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Scan Documents"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sc_an"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"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."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan uses the SANE framework which supports most existing scanners."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Document Scanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Single _Page"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "All Pages From _Feeder"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stop Scan"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Multiple Pages From Flatbed"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Photo"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sc_an"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stop Scan"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reorder Pages"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Rotate _Left"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Rotate _Right"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_None"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Move Left"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Move Right"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Help"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Contents"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Start a new document"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "New"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Save"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Stop the current scan"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stop"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotate the page to the left (anti-clockwise)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Rotate Left"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rotate the page to the right (clockwise)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Rotate Right"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Crop the selected page"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Crop"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferences"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Scan S_ource:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Text Resolution:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Photo Resolution:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Scan Side:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Page Size:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Searching for Scanners…"
 
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brightness:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Quality:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Document Scanner"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Scan Documents"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Close"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Username and password required to access “%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Ready to Scan"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"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."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Additional software needed"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan uses the SANE framework which supports most existing scanners."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Unable to connect to scanner"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Unable to start scan"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Failed to scan"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] - Scanning utility"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Run '%s --help' to see a full list of available command line options."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Close"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Username and password required to access '%s'"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "No scanners detected"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Please check your scanner is connected and powered on"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Additional software needed"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "You need to install driver software for your scanner."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Save As..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Save As…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Save"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "All Files"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (compressed)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "File format:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compression:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "A file named “%s” already exists.  Do you want to replace it?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Replace"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Saving"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Failed to save file"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Contacting scanner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Unable to save image for preview"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Combine sides"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Combine sides (reverse)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Reverse"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Keep unchanged"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -540,18 +556,20 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Bruce Cowan <bruce@bcowan.eu>\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Alex Denvir https://launchpad.net/~coldfff\n"
 "  Andi Chandler https://launchpad.net/~bing\n"
@@ -564,198 +582,541 @@ msgstr ""
 "  Tomasz Chabowski https://launchpad.net/~tomasz-chabowski-googlemail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "You appear to have a Brother scanner."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "You appear to have a Samsung scanner."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "You appear to have an HP scanner."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "You appear to have an Epson scanner."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Install drivers"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Once installed, you will need to restart Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Installing drivers..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Installing drivers…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Drivers installed successfully!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Failed to install drivers (error code %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Failed to install drivers."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "You need to install the %s package(s)."
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "You need to install the %s package."
+msgstr[1] "You need to install the %s packages."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferences"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Keyboard Shortcuts"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Help"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "About"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Quit"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Start Again…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotate the page to the left (anti-clockwise)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotate the page to the right (clockwise)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Crop the selected page"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Delete the selected page"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Cancel"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Authorise"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Username for resource:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Password:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Unable to encode page %i"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Scanning"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Scan a single page"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Scan all pages from document feeder"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Scan continuously from a flatbed scanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stop scan in progress"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Document Modification"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Move page left"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Move page right"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotate page to the left (anti-clockwise)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotate page to the right (clockwise)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Delete page"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Document Management"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Start new document"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Save scanned document"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-mail scanned document"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Print scanned document"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copy current page to clipboard"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Scanner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Scan Sides"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Page Size"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Front"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Back"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Both"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Delay"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Multiple pages from flatbed"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Seconds"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Scanning"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Text Resolution"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "_Photo Resolution"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Brightness"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Quality"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatic"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Darker"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lighter"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Less"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "More"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "New Document"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "No scanners available.  Please connect a scanner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Unable to connect to scanner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Unable to start scan"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Print..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Error communicating with scanner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Help"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Show release version"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "About"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Print debugging messages"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Quit"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Change _Scanner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Failed to scan"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Install Drivers"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Scan in progress"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatic"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — Scanning utility"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Darker"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "Run “%s --help” to see a full list of available command line options."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Lighter"
+#~ msgid "Front and Back"
+#~ msgstr "Front and Back"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Less"
+#~ msgid "New"
+#~ msgstr "New"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "More"
+#~ msgid "Rotate Left"
+#~ msgstr "Rotate Left"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#~ msgid "Rotate Right"
+#~ msgstr "Rotate Right"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#~ msgid "Crop"
+#~ msgstr "Crop"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Saving document..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Scan S_ource:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Saving page %d out of %d"
+#~ msgid "New Document"
+#~ msgstr "New Document"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Email..."
+#~ msgstr "E-mail..."
+
+#~ msgid "Print..."
+#~ msgstr "Print..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Install Drivers"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimum"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximum"
+
+#~ msgid "Saving document..."
+#~ msgstr "Saving document..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Saving page %d out of %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -766,7 +1127,6 @@ msgstr "Saving page %d out of %d"
 #~ msgid "Files missing"
 #~ msgstr "Files missing"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -774,7 +1134,6 @@ msgstr "Saving page %d out of %d"
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -796,21 +1155,17 @@ msgstr "Saving page %d out of %d"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Device to scan from"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Direction of scan"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Directory to save files to"
-
 #~ 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'"
+#~ "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'"
+#~ "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 "TRUE if the application window is maximized"
 #~ msgstr "TRUE if the application window is maximised"
@@ -819,38 +1174,22 @@ msgstr "Saving page %d out of %d"
 #~ "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 the height "
-#~ "of the last image scanned."
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE device to acquire images from."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolution for text scans"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolution for photo scans"
+#~ "The height of scanned image in pixels. This value is updated to the "
+#~ "height of the last image scanned."
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolution of last scanned image"
 
 #~ 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."
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
+#~ "The width of scanned image in pixels. This value is updated to the width "
+#~ "of the last image scanned."
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "The resolution of the last image scanned (in dots-per-inch)."
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type of document being scanned"
-
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -866,16 +1205,12 @@ msgstr "Saving page %d out of %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Window width (in pixels)"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Scanned Document"
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Width of scanned image (in pixels)"
 
 #~ msgid "Select File _Type"
 #~ msgstr "Select File _Type"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -891,70 +1226,15 @@ msgstr "Saving page %d out of %d"
 #~ "  --help-all                      Show all help options\n"
 #~ "  --help-gtk                      Show GTK+ options"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "The resolution in dots-per-inch to use when scanning text."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "The resolution in dots-per-inch to use when scanning photos."
-
-#~ 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'"
-
-#~ 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)."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Page side to scan"
-
 #~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-
-#~ msgid "The page side to scan."
-#~ msgstr "The page side to scan."
-
-#~ 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, "
-#~ "colours and post-processing."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "The direction of the scanner across the scanned page."
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Height of paper (in tenths of a mm)"
-
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Height of scanned image (in pixels)"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Width of paper (in tenths of a mm)"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "The contrast adjustment from -100 to 100 (0 being none)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrast of scan"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "The brightness adjustment from -100 to 100 (0 being none)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Brightness of scan"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Quality value to use for JPEG compression."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Quality value to use for JPEG compression"
diff --git a/po/eo.gmo b/po/eo.gmo
deleted file mode 100644
index e447c33..0000000
--- a/po/eo.gmo
+++ /dev/null
diff --git a/po/eo.po b/po/eo.po
index 874712d..a2c48da 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,297 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2015-06-06 14:32+0000\n"
 "Last-Translator: Manuel Ortega <manuel@grupolasindias.coop>\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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "R_ajtigi"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Sal_utnomo por risurco:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Antaŭo kaj malantaŭo"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Antaŭo"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Dorso"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simpla skano"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Dokumento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Sk_ani"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "Unuopa _paĝo"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Ĉiuj paĝoj el _papero-metilo"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "Haltigi _skani"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Teksto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Reordigi paĝojn"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "R_etpoŝto"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Paĝo"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Turni _maldekstren"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Turni _dekstren"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "Stu_ci"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Neniu"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Propre"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Rotacii la stoco-lokon"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Movi maldekstren"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Movi dekstren"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Helpo"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Enhavo"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Komenci novan dokumenton"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Nova"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Skani"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Konservi dokumenton en dosiero"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Konservi"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Haltigi la aktualan skanon"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Haltigi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotacii la paĝon maldekstren (maldekstrume)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Turni maldekstren"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotacci la paĝon dekstren (dekstrume)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Turni dekstren"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Stuci la elektitan paĝon"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Stuci"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Agordoj"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Skano-f_onto:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Teksta distingivo"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Fotaĵa distingivo:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Skano-flanko:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Paĝo-grando:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Brileco:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Kontrasto:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Kvalito:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Dokumentoskanilo"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skani dokumentojn"
 
@@ -309,7 +322,7 @@ msgstr "skani;skanilo;plata;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -317,197 +330,208 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Neniuj skaniloj disponeblaj.  Bonvolu konekti skanilon."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Ne povas konekto kun skanilo"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Ne povas komenci skani"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Eraro kiam konektanta kun skanilo"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Montri eldonversion"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Presi mesaĝojn pri sencimigo"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Ne sukcesi skani"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APARATO...] - Skanutilaĵo"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 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."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "_Fermi"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Salutnomo kaj pasvorto estas necesa aliri '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Neniuj skaniloj eltrovis"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Bonvolu kontrolas ke via skanilo estas kenekta kaj kurentŝalta"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Konservi kiel..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "Kon_servi"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Skanita Dokumento.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Bildo-dosieroj"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (multpaĝa dokumento)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (densigita)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (senperda)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "Ne sukcesis konservi la dosieron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se vi ne konservas, ŝanĝoj estos perditaj permanente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "Konservi la nunan dokumenton?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Forlasi Ŝanĝojn"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Ne eblis malfermi bild-dosieron"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "Kombini flankojn"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "Kombini flankojn"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Inversigi"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Konservi senŝanĝa"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Ne eblis malfermi help-dosieron"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -537,16 +561,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Pri simpla skani"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Simpla ilo por skanantaj dokumentoj"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -560,189 +584,189 @@ msgstr ""
 "  Tiffany Antopolski https://launchpad.net/~mimico-tiffany"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "Konservi dokumenton antaŭe ĉesanta?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d punktoj en colo (defaŭlto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d punktoj en colo (malneto)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d punktoj en colo (alta distingivo)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Ŝanĝi _Skanilo"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Pli malhele"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Pli hele"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Malpli"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Pli"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minimume"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maksimume"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Konservado de dokumento..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Konservado de paĝo %d el %d"
diff --git a/po/es.gmo b/po/es.gmo
deleted file mode 100644
index 6e621bb..0000000
--- a/po/es.gmo
+++ /dev/null
diff --git a/po/es.po b/po/es.po
index ef29169..3679baa 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,519 +2,527 @@
 # 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.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-10-27 14:48+0000\n"
-"Last-Translator: Jose Luis Tirado <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-11 03:50+0000\n"
+"PO-Revision-Date: 2017-09-11 15:53+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+"Language-Team: es <gnome-es-list@gnome.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizar"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Para escanear desde el dispositivo"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nombre de _usuario para el recurso:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositivo SANE desde donde adquirir las imágenes."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Contraseña:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipo de documento que está siendo escaneado"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Anverso y reverso"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipo de documento escaneándose. Esta configuración establece la resolución "
+"de escaneo, colores y post-procesamiento."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Anverso"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Anchura del papel en décimas de mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Reverso"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Altura del papel en décimas de mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height 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)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brillo de escaneo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+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:40
+msgid "Contrast of scan"
+msgstr "Contraste del escaneo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Resolución para los escaneados de texto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolución para los escaneados de fotografías"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Cara a escanear de la página"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "El lado de la página a escanear."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directorio en el que guardar los archivos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Calidad de la compresión de JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Calidad de la compresión de JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Retardo entre páginas, en milisegundos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Retardo entre páginas, en milisegundos."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Documento"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Escanear documentos"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Esc_anear"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Escanee documentos y fotos con suma sencillez. Es posible recortar las "
+"partes no deseadas de una foto y girarla si quedó al revés. Luego podrá "
+"imprimir las digitalizaciones, exportarlas a PDF o guardarlas en diversos "
+"formatos de imagen."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan emplea el marco SANE para compatibilidad con la mayoría de los "
+"escáneres existentes."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Escáner de documentos"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "escanear;escáner;plano;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Una página"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Todas las páginas del _alimentador"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "D_etener escaneado"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Varias páginas del alimentador"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Documento"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Esc_anear"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "D_etener escaneado"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reordenar las páginas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Correo electrónico"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Girar a la i_zquierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Girar a la _derecha"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ninguno"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "_Oficio"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Girar recorte"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mover a la izquierda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mover a la derecha"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "Ay_uda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Contenido"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Crear un documento nuevo"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nuevo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Detiene el escaneado actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Detener"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Girar a la izquierda"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Buscando escáneres…"
 
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Girar a la derecha"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recortar la página seleccionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recortar"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferencias"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Origen de escaneo:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Resolución de _texto:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Resolución de _fotografía:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Cara a escanear:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Tamaño de página:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brillo:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Calidad:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Escáner de documentos"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Escanear documentos"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Cerrar"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "escanear;escáner;plano;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Usuario y contraseña necesarios para acceder a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "escáner"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Listo para escanear"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Escanee documentos y fotos con suma sencillez. Es posible recortar las "
-"partes no deseadas de una foto y girarla si quedó al revés. Luego podrá "
-"imprimir las digitalizaciones, exportarlas a PDF o guardarlas en diversos "
-"formatos de imagen."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Se necesita software adicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan emplea el marco SANE para compatibilidad con la mayoría de los "
-"escáneres existentes."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "No se pudo conectar al escáner"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Incapaz de iniciar el escaneo"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-msgid "Error communicating with scanner"
-msgstr "Error al comunicarse 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.vala:391
-msgid "Failed to scan"
-msgstr "Falló al escanear"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
-"órdenes disponibles."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Cerrar"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Usuario y contraseña necesarios para acceder a «%s»"
+"Es necesario <a href=\"install-firmware\">instalar controladores software</"
+"a> para el escáner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "No se detectó ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Compruebe que su escáner está encendido y conectado"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Se necesita software adicional"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Es necesario instalar controladores para el escáner."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Guardar como…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Guardar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Todos los archivos"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multipágina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (sin pérdida)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimido)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Formato de archivo:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compresión:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Reemplazar"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Guardando"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "¿Guardar el documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Contactando con el escáner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "No se puede abrir la aplicación de previsualización de imágenes"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (invertido)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Invertir"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Mantener sin cambios"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -545,16 +553,16 @@ msgstr ""
 "vea  <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -585,200 +593,518 @@ msgstr ""
 "  hhlp https://launchpad.net/~hhlp-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "¿Guardar el documento antes de salir?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Parece que tiene un escáner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "En el <a href=\"http://support.brother.com\">sitio web de Brother</a> "
 "encontrará controladores."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Parece que tiene un escáner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "En el <a href=\"http://samsung.com/support\">sitio web de Samsung</a> "
 "encontrará controladores."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Parece que tiene un escáner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Parece que tiene un escáner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Visite el <a href=\"http://support.epson.com\">sitio web de Epson</a> para "
 "encontrar controladores."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instalación de controladores"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Cuando finalice la instalación deberá reiniciar Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Instalando los controladores…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Los controladores se instalaron correctamente."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Falló la instalación de los controladores (cód. de error: %d)"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Falló la instalación de los controladores."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Necesita instalar el paquete %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Necesita instalar el paquete %s."
+msgstr[1] "Necesita instalar los paquetes %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Atajos de teclado"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Acerca de"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Salir"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Correo-e"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Empezar de nuevo…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Recortar la página seleccionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Eliminar la página seleccionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nombre de _usuario para el recurso:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Contraseña:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "No se pudo decodificar la página %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Escaneando"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Escanear una sola página"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Escanear todas las páginas desde el alimentador"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Escanear de manera continua desde un escáner plano"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Detener escaneado en progreso"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificación de documentos"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Mover la página a la izquierda"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Mover la página a la derecha"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Eliminar la página"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestión de documentos"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Iniciar un documento nuevo"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Guardar documento escaneado"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Enviar por correo-e el documento escaneado"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimir el documento escaneado"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copiar la página actual al portapapeles"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Escáner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Caras que escanear"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Tamaño de página"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Anverso"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Reverso"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambas"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Retardo"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "Multiple page from flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Varias páginas del alimentador"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segundos"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Escaneando"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Resolución del _texto"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Resolución de la _fotografía"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Brillo"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contraste"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Calidad"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automático"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Más oscuro"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Más claro"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menos"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Más"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Documento nuevo"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "No hay escáneres disponibles. Conecte un escáner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Documento"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "No se pudo conectar al escáner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Correo..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Incapaz de iniciar el escaneo"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimir…"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Error al comunicarse con el escáner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Ayuda"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostrar el número de versión"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Acerca de"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostrar mensajes de depuración"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Salir"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Cambiar _escáner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Falló al escanear"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instalar controladores"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Escaneado en progreso"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automático"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Más oscuro"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
+"órdenes disponibles."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Más claro"
+#~ msgid "Saving document…"
+#~ msgstr "Guardando el documento…"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menos"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Guardando la página %d de %d"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Más"
+#~ msgid "Front and Back"
+#~ msgstr "Anverso y reverso"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínima"
+#~ msgid "New"
+#~ msgstr "Nuevo"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Máxima"
+#~ msgid "Rotate Left"
+#~ msgstr "Girar a la izquierda"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Guardando el documento…"
+#~ msgid "Rotate Right"
+#~ msgstr "Girar a la derecha"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Guardando la página %d de %d"
+#~ msgid "Crop"
+#~ msgstr "Recortar"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Origen de escaneo:"
+
+#~ msgid "New Document"
+#~ msgstr "Documento nuevo"
+
+#~ msgid "Document"
+#~ msgstr "Documento"
+
+#~| msgid "_Email"
+#~ msgid "Email…"
+#~ msgstr "Correo electrónico…"
+
+#~| msgid "Print..."
+#~ msgid "Print…"
+#~ msgstr "Imprimir…"
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instalar controladores"
+
+#~ msgid "Minimum"
+#~ msgstr "Mínima"
+
+#~ msgid "Maximum"
+#~ msgstr "Máxima"
+
+#~ msgid "Email..."
+#~ msgstr "Correo..."
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -807,7 +1133,6 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Faltan archivos"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -824,36 +1149,28 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Altura de la imagen escaneada en píxeles"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Para escanear desde el dispositivo"
-
 #~ 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'"
+#~ "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'"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipo de documento que está siendo escaneado"
-
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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"
+#~ "La anchura de la imagen escaneada. Este valor se actualiza con el que "
+#~ "tuvo la última página escaneada"
 
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "La altura de la imagen escaneada. Este valor se actualiza con el que tuvo la "
-#~ "última página escaneada"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositivo SANE desde donde adquirir las imágenes."
+#~ "La altura de la imagen escaneada. Este valor se actualiza con el que tuvo "
+#~ "la última página escaneada"
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Anchura de la imagen escaneada"
@@ -864,7 +1181,6 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Anchura de la ventana en píxeles"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -883,9 +1199,6 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADERO si la ventana de la aplicación está maximizada"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolución para los escaneados de texto"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolución de la última imagen escaneada"
 
@@ -893,12 +1206,6 @@ msgstr "Guardando la página %d de %d"
 #~ msgstr ""
 #~ "La resolución en puntos por pulgada de la imagen escaneada anteriormente."
 
-#~ 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."
-
-#~ 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."
-
 #~ msgid "Select File _Type"
 #~ msgstr "Seleccione el _tipo de archivo"
 
@@ -907,80 +1214,16 @@ msgstr "Guardando la página %d de %d"
 #~ "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 "Resolution for photo scans"
-#~ msgstr "Resolución para los escaneados de fotografías"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Documento escaneado"
-
-#~ 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."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Directorio en el que guardar los archivos"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Cara a escanear de la página"
-
-#~ msgid ""
-#~ "The height 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)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Altura del papel en décimas de mm"
-
-#~ 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)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Anchura del papel en décimas de mm"
-
-#~ 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»."
-
-#~ msgid "The page side to scan."
-#~ msgstr "El lado de la página a escanear."
+#~ "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 ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Tipo de documento escaneándose. Esta configuración establece la resolución "
-#~ "de escaneo, colores y post-procesamiento."
+#~ "La cara a escanear de la página. Puede ser uno de los siguientes: "
+#~ "«ambas», «anverso» o «reverso»."
 
 #~ 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."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Brillo de escaneo"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Ajuste del brillo desde -100 a 100 (siendo 0 sin ajuste)."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Ajuste de contraste desde -100 a 100 (siendo 0 sin ajuste)."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Calidad de la compresión de JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Calidad de la compresión de JPEG"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste del escaneo"
diff --git a/po/et.gmo b/po/et.gmo
deleted file mode 100644
index 66364b1..0000000
--- a/po/et.gmo
+++ /dev/null
diff --git a/po/et.po b/po/et.po
index 1814cc2..0007d99 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 08:59+0000\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
+"PO-Revision-Date: 2017-03-29 06:41+0000\n"
 "Last-Translator: mahfiaz <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoriseeri"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Kasutajanimi allika jaoks:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parool:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Esi- ja tagakülg"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Esikülg"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Tagakülg"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Lihtne skannija"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Sk_annimine"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "Üks _lehekülg"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Kõik lehed _söötjast"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "_Lõpeta skannimine"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Lehekülg"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Pööra _vasakule"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Pööra _paremale"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Kärbi"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Puudub"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Kohandatud"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Pööramisega kärbe"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
-msgstr ""
+msgstr "Liiguta vasakule"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "A_bi"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Sisu"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Uue dokumendi alustamine"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Uus"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "Ühe lehekülje skannimine skannerist"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Skanni"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Dokumendi salvestamine faili"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Salvesta"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Selle skannimise lõpetamine"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Lõpeta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Lehekülje pööramine vasakule (vastupäeva)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Vasakule pööramine"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Lehekülje pööramine paremale (päripäeva)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Paremale pööramine"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Valitud lehekülje kärpimine"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Kärbi"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Eelistused"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Skannimise _allikas:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Teksti eraldusvõime:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Foto eraldusvõime:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Slaidi skannimine:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Lehekülje suurus:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Dokumentide skannimine"
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 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.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Skanneriga ei suudetud ühenduda"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Skannimist ei suudetud alustada"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Tõrge skanneriga suhtlemisel"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: 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
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Näita veasilumise sõnumeid"
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Skannimine nurjus"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, 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.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Ühtegi skannerit ei tuvastatud"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrolli, kas skanner on ühendatud ja sisse lülitatud"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Skannitud dokument.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Pildifailid"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Kõik failid"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (mitmeleheküljeline dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (tihendatud)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (kadudeta)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "Faili salvestamine nurjus"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
 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.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "Kas salvestada see dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Tühista muudatused"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "Eelvaate pildi salvestamine ebaõnnestus"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Pildi eelvaatluse rakendust ei suudetud käivitada"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Abiteabe faili pole võimalik avada"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -535,16 +560,16 @@ msgstr ""
 "<http://www.gnu.org/licences/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Lihtsast skannijast lähemalt"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Lihtne dokumendi skaneerimise tööriist"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -553,189 +578,189 @@ msgstr ""
 "  mahfiaz https://launchpad.net/~mahfiaz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "Kas salvestada dokument enne väljumist?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Välju ilma salvestamata"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (vaikimisi)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (mustand)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (kõrge kvaliteet)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Dokumendi salvestamine..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/eu.gmo b/po/eu.gmo
deleted file mode 100644
index 910ee9b..0000000
--- a/po/eu.gmo
+++ /dev/null
diff --git a/po/eu.po b/po/eu.po
index dc71f34..79087f1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,517 +1,535 @@
 # Basque 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.
 #
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2017-01-25 12:52+0000\n"
-"Last-Translator: Ander Elortondo <ander.elor@gmail.com>\n"
-"Language-Team: Basque <eu@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-27 17:54+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+"Language-Team: Basque <librezale@librezale.eus>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-01-26 05:30+0000\n"
-"X-Generator: Launchpad (build 18315)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Baimendu"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Eskaneatze-gailua"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Erabiltzaile-izena baliabiderako:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Irudiak eskuratzeko erabiliko den SANE gailua."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Pasahitza:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Eskaneatuko den dokumentu-mota"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Eskaneatuko den dokumentu-mota. Ezarpen honek eskaneatzearen bereizmena, "
+"koloreak eta posprozesatzea finkatzen du."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Aurrealdea eta atzealdea"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Paperaren zabalera mm hamarrenetan"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Aurrealdea"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Eskaneatutako paperaren zabalera milimetro hamarrenetan (edo 0 paperaren "
+"detekzio automatikorako)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Atzealdea"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Paperaren altuera mm hamarrenetan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"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:35
+msgid "Brightness of scan"
+msgstr "Eskanerraren distira"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Distiraren doiketa, -100etik 100era (0 = distirarik ez)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Eskanerraren kontrastea"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrastearen doiketa, -100etik 100era (0 = kontrasterik ez)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Bereizmena testuen eskaneatzerako"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Testua eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Bereizmena argazkien eskaneatzerako"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Eskaneatuko den aldea"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Eskaneatuko den orrialdea."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Fitxategiak gordetzeko direktorioa"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Orrien arteko atzerapena (milisegundotan)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Orrien arteko atzerapena (milisegundotan)."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokumentua"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Eskaneatu dokumentuak"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Es_kaneatu"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Modu benetan erraza dokumentuak zein argazkiak eskaneatzeko. Argazki baten "
+"parte txarrak ebaki eta"
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan SANE framework erabiltzen du dauden eskaner gehienei sostengua "
+"emateko."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentuen eskanerra"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"eskaneatu;eskanerra;eskanerreko_kristala;Dokumentu_elikatze_automatiko;"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Orrialde bakarra"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "_Elikagailuko orri guztiak"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Gelditu eskaneatzea"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Hainbat orri eskaner lautik"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Testua"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Argazkia"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokumentua"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Es_kaneatu"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Gelditu eskaneatzea"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Berrordenatu orrialdeak"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Posta elektronikoa"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Orrialdea"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Biratu e_zkerrera"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Biratu e_skuinera"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Moztu"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Bat ere ez"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "AEBetako gutuna"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "AEBetako le_gala"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Pertsonalizatua"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Biratu mozketa"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mugitu ezkerrera"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mugitu eskuinera"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Laguntza"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Hasi dokumentu berria"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Berria"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Eskaneatu eskanerreko orrialde bakarra"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Eskaneatu"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Gorde dokumentua fitxategi batean"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Gorde"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Gelditu uneko eskaneatzea"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Gelditu"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Biratu ezkerrera"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Biratu orrialdea eskuinra (erlojuaren noranzkoan)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Biratu eskuinera"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Moztu hautatutako orrialdea"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Moztu"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Hobespenak"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Eskaneatze-_jatorria:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Testu-bereizmena:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Ar_gazki-bereizmena:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Eskaneatze-aldea:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Eskanerrak bilatzen…"
 
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Orrialde-tamaina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Distira:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrastea:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kalitatea:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentuen eskanerra"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Eskaneatu dokumentuak"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Itxi"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-"eskaneatu;eskanerra;eskanerreko_kristala;Dokumentu_elikatze_automatiko;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Erabiltzaile-izena eta pasahitza behar dira “%s” atzitzeko"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "eskanerra"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Eskaneatzeko prest"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Modu benetan erraza dokumentuak zein argazkiak eskaneatzeko. Argazki baten "
-"parte txarrak ebaki eta"
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Software gehiago behar da"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Simple Scan SANE framework erabiltzen du dauden eskaner gehienei sostengua "
-"emateko."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Ezin da eskanerrarekin konektatu"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Ezin da eskanerra abiarazi"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Ezin izan da eskaneatu"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Itxi"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Erabiltzaile-izena eta pasahitza behar dira '%s' atzitzeko"
+"Zure eskanerrentzako <a href=\"install-firmware\">kontrolatzaile softwarea "
+"instalatu</a> behar duzu."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Ez da eskanerrik detektatu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Egiaztatu zure eskanerra konektatuta eta piztuta dagoela"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Software gehiago behar da"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Zure eskanerrentzako kontrolatzaile softwarea instalatu behar duzu."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Gorde honela..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Gorde honela…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Gorde"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr "Dokumetu eskaneatua.pdf"
+msgstr "Dokumentu eskaneatua.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Irudi-fitxategiak"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (orrialde anitzeko dokumentua)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (konprimitua)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (galerarik gabea)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (konprimitua)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Fitxategi-formatua:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Konpresioa:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "“%s” izeneko fitxategia badago lehendik ere. Ordeztea nahi duzu?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Ordeztu"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Gordetzen"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Gorde uneko dokumentua?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Baztertu aldaketak"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Eskanerrarekin harremanetan jartzen…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Ezin izan da aurrebistarako irudia gorde"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Ezin izan da ireki irudiaren aurrebistarako aplikazioa"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Konbinatu aldeak"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Konbinatu aldeak (alderantziz)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Alderantziz"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Mantendu aldatu gabe"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Ezin izan da ireki laguntza-fitxategia"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -540,16 +558,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Simple Scan-i buruz"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Dokumentuak eskaneatzeko tresna sinplea"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -566,198 +584,542 @@ msgstr ""
 "  gorkaazk https://launchpad.net/~gorkaazkarate"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Gorde dokumentua irten baino lehen?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Brother eskanerra duzuela ematen du."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Honentzako kontrolatzaileak  <a href=\"http://support.brother.com\">Brother "
 "webgunean</a> erabilgarri daude."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Samsung eskanerra duzuela ematen du."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Honentzako kontrolatzaileak <a href=\"http://samsung.com/support\">Samsung "
 "webgunean</a> erabilgarri daude."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "HP eskanerra duz uela ematen du."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Epson eskanerra duzuela ematen du."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Honentzako kontrolatzaileak <a href=\"http://support.epson.com\">Epson "
 "webgunean</a> erabilgarri daude."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instalatu kontrolatzaileak"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Behin instalatua Simple Scan berabiarazi behar duzu."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Kontrolatzaileak instalatzen..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Kontrolatzaileak instalatzen…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Kontrolatzaileak ondo instalatu dira!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Ezin izan dira kontrolatzaileak instalatu (%d errore kodea)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Ezin izan dira kontrolatzaileak instalatu."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
+#, c-format
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "%s paketea instalatu behar duzu."
+msgstr[1] "%s paketeak instalatu behar dituzu."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Laster-teklak"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Laguntza"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Honi buruz"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Irten"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "Posta elektronikoa"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Hasi berriro…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Biratu orrialdea eskuinera (erlojuaren noranzkoan)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Moztu hautatutako orrialdea"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Ezabatu hautatutako orria"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Utzi"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Baimendu"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Erabiltzaile-izena baliabiderako:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Pasahitza:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "%s pakete(ak) instalatu behar duzu (dituzu).."
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Ezin da %i. orria kodetu"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Eskaneatzen"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Eskaneatu orrialde bakarra"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Eskaneatu orrialde guztiak dokumentuen elikagailutik"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Eskaneatu jarraian eskaner lau batetik"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Gelditu eskaneatze lana"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentuaren eraldaketa"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Eraman orrialdea ezkerrera"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Eraman orrialdea eskuinera"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Biratu orrialdea eskuinera (erlojuaren noranzkoan)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Ezabatu orrialdea"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumentuen kudeaketa"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Hasi dokumentu berria"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gorde eskaneatutako dokumentua"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Bidali postaz eskaneatutako dokumentua"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Inprimatu eskaneatutako dokumentua"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiatu uneko orrialdea arbelean"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "scanner"
+msgid "_Scanner"
+msgstr "_Eskanerra"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Eskaneatu aldeak"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Orrialde-tamaina"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Aurrealdea"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Atzealdea"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Biak"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Atzerapena"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Hainbat orrialde eskaner lautik"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segundo"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Eskaneatzea"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Testu-bereizmena"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "Ar_gazki-bereizmena"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Distira"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Kontrastea"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Kalitatea"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatikoa"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Ilunago"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Argiago"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Gutxiago"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Gehiago"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (lehenetsia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (bereizmen altua)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Dokumentu berria"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Ez dago eskanerrik erabilgarri. Mesedez, konektatu eskaner bat."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokumentua"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Ezin da eskanerrarekin konektatu"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Bidali postaz..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Ezin da eskanerra abiarazi"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Inprimatu..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Errorea eskanerrarekin komunikatzean"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Laguntza"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Erakutsi bertsioa"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Honi buruz"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Inprimatu arazketa-mezuak"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Irten"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Aldatu e_skanerra"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Ezin izan da eskaneatu"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instalatu kontrolatzaileak"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Eskaneatzea lanean"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatikoa"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — Eskaneatze-tresna"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Ilunago"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+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:1949
-msgid "Lighter"
-msgstr "Argiago"
+#~ msgid "Front and Back"
+#~ msgstr "Aurrealdea eta atzealdea"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Gutxiago"
+#~ msgid "New"
+#~ msgstr "Berria"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Gehiago"
+#~ msgid "Rotate Left"
+#~ msgstr "Biratu ezkerrera"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimoa"
+#~ msgid "Rotate Right"
+#~ msgstr "Biratu eskuinera"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximoa"
+#~ msgid "Crop"
+#~ msgstr "Moztu"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Dokumentua gordetzen..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Eskaneatze-_jatorria:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "%d orria (%d-etik) gordetzen"
+#~ msgid "New Document"
+#~ msgstr "Dokumentu berria"
+
+#~ msgid "Document"
+#~ msgstr "Dokumentua"
+
+#~ msgid "Email..."
+#~ msgstr "Bidali postaz..."
+
+#~ msgid "Print..."
+#~ msgstr "Inprimatu..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instalatu kontrolatzaileak"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimoa"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximoa"
+
+#~ msgid "Saving document..."
+#~ msgstr "Dokumentua gordetzen..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "%d orria (%d-etik) gordetzen"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -768,19 +1130,9 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Eskaneatutako irudiaren altuera pixeletan"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Bereizmena testuen eskaneatzerako"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Bereizmena argazkien eskaneatzerako"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Eskaneatutako azken irudiaren bereizmena"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Fitxategiak gordetzeko direktorioa"
-
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -792,31 +1144,27 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgstr "Egiaztatu instalazioa"
 
 #~ 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'"
+#~ "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' "
+#~ "Eskanerraren noranzkoa eskaneatuko den orrialdean zehar. Hurrengoetako "
+#~ "bat izan daiteke: 'goitik behera' 'behetik gora' 'ezkerretik eskuinera' "
 #~ "'eskuinetik ezkerrera'"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE aplikazio-leihoa maximizatuta badago"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Eskaneatze-gailua"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "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"
-#~ msgstr "Eskaneatuko den dokumentu-mota"
+#~ "Eskaneatuko den aldea. Hurrengoetako bat izan daiteke: 'biak' "
+#~ "'aurrealdea' 'atzealdea'"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
@@ -825,14 +1173,8 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Eskaneatutako irudiaren altuera pixeletan. Parametro hau eskaneatutako azken "
-#~ "orrialdearen baliora eguneratzen da."
-
-#~ 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."
+#~ "Eskaneatutako irudiaren altuera pixeletan. Parametro hau eskaneatutako "
+#~ "azken orrialdearen baliora eguneratzen da."
 
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
@@ -840,8 +1182,8 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "processing."
 #~ msgstr ""
 #~ "Eskaneatuko den dokumentu-mota, 'testua' testu-dokumentuak badira, "
-#~ "'argazkia' argazkiak badira. Ezarpen honek eskaneatze-bereizmena, koloreak "
-#~ "eta post-tratamendua finkatzen du."
+#~ "'argazkia' argazkiak badira. Ezarpen honek eskaneatze-bereizmena, "
+#~ "koloreak eta post-tratamendua finkatzen du."
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Leihoaren zabalera pixeletan"
@@ -852,28 +1194,12 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Eskaneatutako irudiaren zabalera pixeletan"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Eskaneatutako dokumentua"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Hautatu fit_xategi-mota"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Irudiak eskuratzeko erabiliko den SANE gailua."
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Aurretik eskaneatutako irudiaren bereizmena (puntuak hazbeteko)."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Testua eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Argazkiak eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Eskaneatuko den aldea"
-
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -893,7 +1219,6 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "  --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"
@@ -912,53 +1237,5 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Direction of scan"
 #~ msgstr "Eskaneatzearen noranzkoa"
 
-#~ msgid ""
-#~ "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)."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Eskaneatutako paperaren zabalera milimetro hamarrenetan (edo 0 paperaren "
-#~ "detekzio automatikorako)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Paperaren zabalera mm hamarrenetan"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Paperaren altuera mm hamarrenetan"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Eskaneatuko den orrialdea."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Eskaneatuko den dokumentu-mota. Ezarpen honek eskaneatzearen bereizmena, "
-#~ "koloreak eta posprozesatzea finkatzen du."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Eskanerraren zentzua eskaneatutako orrian zehar."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Eskanerraren kontrastea"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Eskanerraren distira"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrastearen doiketa, -100etik 100era (0 = kontrasterik ez)."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Distiraren doiketa, -100etik 100era (0 = distirarik ez)."
diff --git a/po/fa.po b/po/fa.po
new file mode 100644
index 0000000..fa1b22e
--- /dev/null
+++ b/po/fa.po
@@ -0,0 +1,1017 @@
+# Persian translation for simple-scan.
+# Copyright (C) 2017 simple-scan's COPYRIGHT HOLDER
+# This file is distributed under the same license as the simple-scan package.
+# Goudarz Jafari <goudarz.jafari@gmail.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan gnome-3-26\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-"
+"scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-11 03:50+0000\n"
+"PO-Revision-Date: 2017-09-22 17:00+0330\n"
+"Language-Team: Persian <fa@li.org>\n"
+"Language: fa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Last-Translator: Goudarz Jafari <goudarz.jafari@gmail.com>\n"
+"X-Generator: Poedit 2.0.3\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "دستگاه برای اسکن کردن از"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "دستگاه SANE برای دریافت تصاویر از طریق آن."
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "نوع نوشتار در حال اسکن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"نوع نوشتار درحال اسکن شدن. این تنظیمات بر روی وضوح اسکن، رنگ‌ها و پردازش پس از "
+"اسکن اعمال می‌شود."
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "عرض کاغذ در دهم میلی‌متر"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "ارتفاع کاغذ در دهم میلی‌متر"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+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:35
+msgid "Brightness of scan"
+msgstr "روشنایی اسکن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "تنظیم روشنایی از -۱۰۰ تا ۱۰۰ (0 هیچ‌کدام)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "سایه روشن اسکن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "تنظیم کنتراست از -۱۰۰ تا ۱۰۰ (۰ هیچ کدام)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "تفکیک‌پذیری برای اسکن متن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "تفکیک‌پذیری نقطه در هر اینچ برای استفاده در اسکن متن."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "تفکیک‌پذیری برای اسکن عکس"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "تفکیک‌پذیری نقطه در هر اینچ برای استفاده در هنگام اسکن تصاویر."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "سمتِ صفحه برای اسکن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "سمتِ صفحه‌ای که باید اسکن شود."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "شاخه مربوط به ذخیرهٔ پرونده‌ها"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"شاخه‌ای که پرونده‌ها در آن ذخیره می‌شوند. اگر تنظیم نشود، پیش‌فرض شاخهٔ نوشتارها."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "میزان کیفیت برای استفاده در هنگام فشرده‌سازی JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "میزان کیفیت برای استفاده در هنگام فشرده‌سازی JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "تاخیر زمانی بین صفحات به میلی ثانیه"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "تاخیر زمانی بین صفحات به میلی ثانیه."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
+msgid "Simple Scan"
+msgstr "اسکن ساده"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "اسکن پرونده‌ها"
+
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"یک راه ساده برای اسکن اسناد و تصاویر. شما میتوانید قسمت‌های نامتناسب را برش "
+"دهید و بچرخانید. می‌توانید اسکن‌های خود را چاپ کنید، یا آنها را به pdf منتقل "
+"کنید، یا در بازه‌ای در قالب‌های مختلف تصویر، ذخیره کنید."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"«اسکن ساده» از چهارچوب SANE جهت پشتیبانی از اسکنرهای موجود استفاده می‌کند."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "اسکنر پرونده"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;اسکن;اسکنر;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+msgid "Single _Page"
+msgstr "تک _صفحه‌ای"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+msgid "All Pages From _Feeder"
+msgstr "تمام صفحات از _منبع تغذیه"
+
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_چند صفحه از Flatbed"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+msgid "Text"
+msgstr "متن"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+msgid "Photo"
+msgstr "عکس"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_سند"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "ا_سکن"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_توقف اسکن"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+msgid "Reorder Pages"
+msgstr "جابجایی صفحات"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "_پست‌الکترونیکی"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "_صفحه"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "چرخش به _چپ"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "چرخش به _راست"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "_برش"
+
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "_هیچ‌کدام"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+msgid "_Letter"
+msgstr "_نامه"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+msgid "Le_gal"
+msgstr "_قانونی"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+msgid "4×6"
+msgstr "۶×۴"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:397
+msgid "_Custom"
+msgstr "_سفارشی"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:415
+msgid "_Rotate Crop"
+msgstr "_چرخاندن برش"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:428
+msgid "Move Left"
+msgstr "جابه‌جایی به چپ"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:437
+msgid "Move Right"
+msgstr "جابه‌جایی به راست"
+
+#. Label on help menu
+#: src/app-window.ui:474
+msgid "_Help"
+msgstr "_راهنما"
+
+#. Help|Contents menu
+#: src/app-window.ui:482
+msgid "_Contents"
+msgstr "_فهرست"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:520 src/app-window.ui:720
+msgid "Scan a single page from the scanner"
+msgstr "اسکن یک صفحه از طریق اسکنر"
+
+#. Label on scan toolbar item
+#: src/app-window.ui:522 src/app-window.ui:716
+msgid "Scan"
+msgstr "اسکن"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:538 src/app-window.ui:787
+msgid "Save document to a file"
+msgstr "ذخیره سند در پرونده"
+
+#: src/app-window.ui:540
+msgid "Save"
+msgstr "ذخیره"
+
+#. Tooltip for stop button
+#: src/app-window.ui:555 src/app-window.ui:700
+msgid "Stop the current scan"
+msgstr "توقف اسکن فعلی"
+
+#: src/app-window.ui:556 src/app-window.ui:697
+msgid "Stop"
+msgstr "توقف"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "در حال جست‌وجو برای اسکنرها…"
+
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_بستن"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "برای دسترسی به (%s) نیاز به نام کاربری و رمز عبور دارید"
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "آماده برای اسکن"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "نرم افزار اضافی مورد نیاز است"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for your "
+"scanner."
+msgstr ""
+"لازم است <a href=\"install-firmware\">نرم‌افزازِ راه انداز</a> را برای اسکنر خود "
+"نصب کنید."
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:281
+msgid "No scanners detected"
+msgstr "اسکنری پیدا نشد"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:283
+msgid "Please check your scanner is connected and powered on"
+msgstr "لطفا بررسی کنید که اسکنر شما متصل و روشن باشد"
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "ذخیره به عنوان…"
+
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: src/app-window.vala:302 src/app-window.vala:553
+msgid "_Save"
+msgstr "_ذخیره"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:310
+msgid "Scanned Document.pdf"
+msgstr "Scanned Document.pdf"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
+msgid "Image Files"
+msgstr "پرونده‌های تصاویر"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:326
+msgid "All Files"
+msgstr "تمام پرونده‌ها"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:335
+msgid "PDF (multi-page document)"
+msgstr "PDF (سند چند صفحه‌ای)"
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:341
+msgid "JPEG (compressed)"
+msgstr "JPEG (فشرده)"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:347
+msgid "PNG (lossless)"
+msgstr "PNG (بدون کاهش کیفیت)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (فشرده)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
+msgid "File format:"
+msgstr "قالب پرونده:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "فشرده‌سازی:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "پرونده‌ای از پیش با نام «%s» ذخیره شده. می‌خواهید آن را جای‌گزین کنید؟"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_جایگزینی"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "درحال ذخیره"
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:527
+msgid "Failed to save file"
+msgstr "ذخیره پرونده شکست خورد"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:550
+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/app-window.vala:591
+msgid "Save current document?"
+msgstr "ذخیره سند جاری؟"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:593
+msgid "Discard Changes"
+msgstr "نادیده گرفتن تغییرات"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "در حال برقراری ارتباط با اسکنر…"
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:800
+msgid "Unable to save image for preview"
+msgstr "نمی‌توان پرونده را برای پیش‌نمایش ذخیره کرد"
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:812
+msgid "Unable to open image preview application"
+msgstr "نمی‌توان برنامه پیش‌نمایش تصویر را باز کرد"
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:990
+msgid "Combine sides"
+msgstr "ترکیبِ طرف‌ها"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1000
+msgid "Combine sides (reverse)"
+msgstr "ترکیب دو طرف (معکوس)"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1010
+msgid "Reverse"
+msgstr "معکوس"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1020
+msgid "Keep unchanged"
+msgstr "نگه‌داشتن بدون تغییر"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1250
+msgid "Unable to open help file"
+msgstr "نمیتوان فایل راهنما را باز کرد"
+
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1271
+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"
+"که بنیاد نرم‌افزارهای آزاد منتشر کرده است،‌ تغییر دهید یا دوباره توزیع کنید. یا "
+"نسخه‌ی ۲ اجازه‌نامه\n"
+"یا (به اختیار خودتان) هر نسخه‌ی بالاتر دیگری.\n"
+"\n"
+"این برنامه با این امید توزیع شده است که به درد بخور باشد، اما بدون هر گونه "
+"ضمانتی؛ حتی بدون\n"
+"ضمانت ضمنی قابل فروش بودن یا مناسب بودن برای یک هدف مشخص. برای جزئیات بیشتر "
+"به\n"
+"اجازه‌نامه‌ی همگانی عمومی گنو را ببینید.\n"
+"\n"
+"شما باید به همراه این برنامه رونوشتی از اجازه‌نامه‌ی عمومی همگانی گنو را دریافت "
+"می‌کردید،\n"
+"اگر این‌گونه نیست، «http://www.gnu.org/licenses» را ببینید."
+
+#. Title of about dialog
+#: src/app-window.vala:1274
+msgid "About Simple Scan"
+msgstr "دربارهٔ «اسکن ساده»"
+
+#. Description of program
+#: src/app-window.vala:1277
+msgid "Simple document scanning tool"
+msgstr "یک اسکنر ساده برای اسناد"
+
+#: src/app-window.vala:1286
+msgid "translator-credits"
+msgstr ""
+"Arash Mousavi <mousavi.arash@gmail.com>\n"
+"goudarz jafari <goudarz.jafari@gmail.com>\n"
+"ssshojaei <shojaeisaleh@gmail.com>"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1308
+msgid "Save document before quitting?"
+msgstr "ذخیره پرونده قبل از خروج؟"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
+msgid "Quit without Saving"
+msgstr "خروج بدون ذخیره‌سازی"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1357
+msgid "You appear to have a Brother scanner."
+msgstr "ظاهرا شما یک اسکنر Brother دارید."
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1359
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+"راه اندازها برای این دستگاه را میتوانید از <a href=\"http://support.brother.com"
+"\">وب‌سایت Brother</a> پیدا کنید."
+
+#. Message to indicate a Samsung scanner has been detected
+#: src/app-window.vala:1363
+msgid "You appear to have a Samsung scanner."
+msgstr "ظاهرا شما یک اسکنر سامسونگ دارید."
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1365
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+"راه اندازها برای این دستگاه را میتوانید از <a href=\"http://samsung.com/support"
+"\">وب‌سایت سامسونگ</a> پیدا کنید."
+
+#. Message to indicate a HP scanner has been detected
+#: src/app-window.vala:1369
+msgid "You appear to have an HP scanner."
+msgstr "ظاهرا شما یک اسکنر HP دارید."
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have an Epson scanner."
+msgstr "شما ظاهرا یک اسکنر Epson دارید."
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1376
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+"راه اندازها برای این دستگاه را میتوانید از <a href=\"http://support.epson.com"
+"\">وب‌سایت Epson</a> پیدا کنید."
+
+#. Title of dialog giving instructions on how to install drivers
+#: src/app-window.vala:1380
+msgid "Install drivers"
+msgstr "نصب راه‌اندازها"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1411
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "پس از نصب شما باید برنامه «اسکن ساده» را دوباره باز کنید."
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "در حال نصب راه‌اندازها…"
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1431
+msgid "Drivers installed successfully!"
+msgstr "راه‌اندازها با موفقیت نصب شدند!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1441
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "نصب راه‌انداز شکست خورد (خطا در کد %Id)"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1447
+msgid "Failed to install drivers."
+msgstr "خطا در نصب راه‌انداز."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "لازم است بستهٔ %s را نصب کنید."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591 src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "تنظیمات"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "میانبرهای کیبورد"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "راهنما"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "درباره"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "خروج"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "پست‌الکترونیکی"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "شروع دوباره…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "چرخاندن صفحه به چپ (خلاف جهت عقربه‌های ساعت)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "چرخاندن صفحه به راست (در جهت عقربه‌های ساعت)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "برش صفحه انتخاب شده"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "حذف صفحه انتخاب شده"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "لغو"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_تایید مجوز"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_نام کاربری برای منبع:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_گذرواژه:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "خطا در رمزگذاری صفحه %Ii"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "در حال اسکن"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "اسکنِ یک صفحه"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "اسکن کردن تمام صفحات در منبع تغذیه سند"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "اسکن مداوم از یک اسکنر flatbed"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "متوقف کردن اسکن جاری"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "اصلاح سند"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "جابه‌جایی صفحه به چپ"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "جابه‌جایی صفحه به راست"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "چرخاندن صفحه به چپ (خلاف جهت عقربه‌های ساعت)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "چرخاندن صفحه به راست (در جهت عقربه‌های ساعت)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "حذف صفحه"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "مدیریت سندها"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "شروع اسکن سند جدید"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "ذخیره سند اسکن شده"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "پست سند اسکن شده"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "چاپ سند اسکن شده"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "رونوشت از این صفحه در تخته‌گیره"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_اسکنر"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "اسکن سمت‌های مختلف"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "اندازه صفحه"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "جلو"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "عقب"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "هر دو"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "تاخیر"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "صفحات چندگانه از flatbed"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "۳"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "۵"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "۷"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "۱۰"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "۱۵"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "ثانیه"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "در حال اسکن"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_تفکیک‌پذیری متن"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_تفکیک‌پذیری تصویر"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "روشنایی"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "سایه‌روشن"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "کیفیت"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "خودکار"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "تیره‌تر"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "روشن‌تر"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "کمتر"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "بیشتر"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%Id dpi (پیش فرض)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%Id dpi (پیش نویس)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%Id dpi (بالاترین تفکیک‌پذیری)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%Id dpi"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "اسکنری موجود نیست. لطفا یک اسکنر را متصل کنید."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "امکان برقراری ارتباط با اسکنر نبود"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "امکان شروع اسکن نبود"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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:392
+msgid "Failed to scan"
+msgstr "اسکن شکست خورد"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "در حال انجام است"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — ابزار اسکن"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "برای مشاهده راهنمای خط فرمان (%s --help) را وارد کنید."
diff --git a/po/fi.gmo b/po/fi.gmo
deleted file mode 100644
index 11bcb96..0000000
--- a/po/fi.gmo
+++ /dev/null
diff --git a/po/fi.po b/po/fi.po
index f294d9c..310ad92 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,515 +2,533 @@
 # 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.
+# Jiri Grönroos <jiri.gronroos+l10n@iki.fi>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-30 10:42+0300\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
+"Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Valtuuta"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Laite jolta luetaan"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Resurssin _käyttäjänimi:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-laite jolta kuvat luetaan."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Salasana:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Luettavan asiakirjan tyyppi"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Etu- ja takapuoli"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"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."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Etupuoli"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Paperin leveys kymmenesosamilleinä"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Takapuoli"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"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/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Paperin pituus kymmenesosamilleinä"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"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:35
+msgid "Brightness of scan"
+msgstr "Kuvanluvun kirkkaus"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+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:40
+msgid "Contrast of scan"
+msgstr "Kuvanluvun kontrasti"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Tarkkuus tekstin lukemiseen"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa tekstiä."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Tarkkuus valokuvien luvulle"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa kuvia."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Skannattava puoli"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Skannattavan sivun puoli."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Kansio, johon tiedostot tallennetaan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Kansio, johon tiedostot tallennetaan. Oletusasetus on Asiakirjat-kansio."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG-pakkaukseen käytettävä laatuarvo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG-pakkaukseen käytettävä laatuarvo."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Viive millisekunneissa sivujen välillä"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Viive millisekunneissa sivujen välillä."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Kuvanluku"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Asiakirja"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Lue asiakirjoja kuvanlukijalta"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Lue kuv_a"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Helppo tapa lukea (skannata) asiakirjoja ja valokuvia. Voit rajata huonot "
+"osat valokuvista pois tai kääntää niitä. Luettuja kuvia voidaan tulostaa, "
+"viedä PDF-muotoon tai tallentaa eri kuvamuodoissa."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Tämä sovellus käyttää SANE-kehystä tukeakseen useimpia olemassa olevia "
+"kuvanlukijoita."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Asiakirjojen kuvanlukuohjelma"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "kuvanluku;skanneri;scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Yksi _sivu"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Kaikki sivut _laitteelta"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Py_säytä kuvanluku"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Useita sivuja tasokuvanlukijasta"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Teksti"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Valokuva"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Asiakirja"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Lue kuv_a"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Py_säytä kuvanluku"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Järjestä sivut"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Sähköposti"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Sivu"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Kierrä _vasemmalle"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Kierrä _oikealle"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Rajaa"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "US Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Muu"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Kierr_ä rajausta"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Siirrä vasemmalle"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Siirrä oikealle"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "O_hje"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Aloita uusi asiakirja"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Uusi"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Lue yksi sivu kuvanlukijalta"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Lue"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Tallenna"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Pysäytä kuvan lukeminen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Pysäytä"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Kierrä sivua vasemmalle (vastapäivään)"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Etsitään kuvanlukijoita…"
 
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Kierrä vasemmalle"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Kierrä sivua oikealle (myötäpäivään)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Kierrä oikealle"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Rajaa nykyistä sivua"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Rajaa"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Asetukset"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Lue lähtee_stä:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Tekstin tarkkuus:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Valokuvan tarkkuus:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Luettava puoli:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sivun koko:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Kirkkaus:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrasti:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Laatu:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Asiakirjojen kuvanlukuohjelma"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Lue asiakirjoja kuvanlukijalta"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Sulje"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "kuvanluku;skanneri;scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Käyttäjänimi ja salasana vaaditaan laitteen “%s” käyttämiseksi"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Valmiina lukemaan"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Helppo tapa lukea (skannata) asiakirjoja ja valokuvia. Voit rajata huonot "
-"osat valokuvista pois tai kääntää niitä. Luettuja kuvia voidaan tulostaa, "
-"viedä PDF-muotoon tai tallentaa eri kuvamuodoissa."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Lisäohjelmistoja vaaditaan"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Tämä sovellus käyttää SANE-kehystä tukeakseen useimpia olemassa olevia "
-"kuvanlukijoita."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Kuvanlukijoita ei löydy. Yhdistä kuvanlukija."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Kuvanlukijaan ei voi yhdistää"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Kuvanluvun käynnistäminen ei onnistu"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Kuvanluku epäonnistui"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[LAITE...] - Skannaus apuohjelma"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "Näet kaikki komentorivivalitsimet komennolla \"%s --help\""
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Sulje"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Käyttäjänimi ja salasana vaaditaan laitteelle ”%s” pääsemiseksi"
+"Kuvanlukijaa varten on <a href=\"install-firmware\">asennettava erillinen "
+"ajuri</a>."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Lisäohjelmistoja vaaditaan"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Kuvanlukijaa varten on asennettava erillinen ajuri."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Tallenna nimellä..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Tallenna nimellä…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Tallenna"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (pakattu)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Tiedostomuoto:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Pakkaus:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Tiedosto nimeltä “%s” on jo olemassa. Haluatko korvata sen?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Korvaa"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Tallennetaan"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Tiedoston tallennus epäonnistui"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+msgid "If you don’t save, changes will be permanently lost."
 msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Yhdistetään kuvanlukijaan…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Esikatselun tallennus epäonnistui"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Yhdistä puolet"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Yhdistä puolet (käänteinen)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Käänteinen"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Säilytä muuttumattomana"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -537,22 +555,24 @@ msgstr ""
 "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/>."
+"tämän ohjelman mukana. Jos et saanut, katso lisätietoja osoitteesta <http://"
+"www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Tietoja sovelluksesta"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Jiri Grönroos\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Elias Julkunen https://launchpad.net/~eliasj\n"
 "  Heidi Mattila https://launchpad.net/~hessuk-deactivatedaccount\n"
@@ -564,204 +584,546 @@ msgstr ""
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Käytössäsi vaikuttaa olevan Brother-kuvanlukija."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Sen ajurit voi ladata <a href=\"http://support.brother.com\">Brotherin "
 "verkkosivustolta</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Käytössäsi vaikuttaa olevan Samsung-kuvanlukija."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Sen ajurit voi ladata <a href=\"http://samsung.com/support\">Samsungin "
 "verkkosivustolta</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Käytössäsi vaikuttaa olevan HP-kuvanlukija."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Käytössäsi vaikuttaa olevan Epson-kuvanlukija."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Sen ajurit voi ladata <a href=\"http://support.epson.com\">Epsonin "
 "verkkosivustolta</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Asenna ajurit"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Kun ajurit on asennettu, kuvanlukusovellus on käynnistettävä uudelleen."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Asennetaan ajureita..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Asennetaan ajureita…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Ajurit asennettiin onnistuneesti!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Ajurien asentaminen epäonnistui (virhekoodi %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Ajurien asentaminen epäonnistui."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
+#, c-format
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "%s paketti/paketit tulee asentaa."
+msgstr[1] "%s paketti/paketit tulee asentaa."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Pikanäppäimet"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ohje"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Tietoja"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Lopeta"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "Sähköposti"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Aloita uudelleen…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Kierrä sivua vasemmalle (vastapäivään)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Kierrä sivua oikealle (myötäpäivään)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Rajaa nykyistä sivua"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Poista valittu sivu"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Peru"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Valtuuta"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Resurssin _käyttäjänimi:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Salasana:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "%s paketti/paketit tulee asentaa."
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Sivun %i koodaus epäonnistui"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Kuvanluku"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Lue yksi sivu kuvanlukijalta"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Lue kaikki sivut asiakirjasyöttäjältä"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Lue jatkuvasti tasokuvanlukijasta"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Pysäytä käynnissä olevan kuvanluku"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Asiakirjan muokkaus"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Siirrä sivu vasemmalle"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Siirrä sivu oikealle"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Kierrä sivua vasemmalle (vastapäivään)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Kierrä sivua oikealle (myötäpäivään)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Poista sivu"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Asiakirjan hallinta"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Aloita uusi asiakirja"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Tallenna luettu asiakirja"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Lähetä luettu asiakirja sähköpostitse"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Tulosta luettu asiakirja"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopioi nykyinen sivu leikepöydälle"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Kuvanlukija"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Luettava puoli"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Sivun koko"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Etupuoli"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Takapuoli"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Molemmat"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Viive"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Useita sivuja tasokuvanlukijasta"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "sekuntia"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Kuvanluku"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Tekstin tarkkuus"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "_Valokuvan tarkkuus"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Kirkkaus"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Kontrasti"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Laatu"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automaattinen"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tummempi"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Vaaleampi"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Vähemmän"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Enemmän"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (korkea tarkkuus)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Uusi asiakirja"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Kuvanlukijoita ei löydy. Yhdistä kuvanlukija."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Asiakirja"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Kuvanlukijaan ei voi yhdistää"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Sähköposti..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Kuvanluvun käynnistäminen ei onnistu"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Tulosta..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Virhe viestinnässä kuvanlukijan kanssa"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Ohje"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Näytä julkaisuversio"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Tietoja"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Tulosta virheenjäljitysviestit"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Lopeta"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Korjaa vanhemmilla Kuvanlukijan versioilla luodut PDF-tiedostot"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Muuta _kuvanlukijaa"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Kuvanluku epäonnistui"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Asenna ajurit"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Kuvanluku meneillään"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automaattinen"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[LAITE...] — Kuvanlukusovellus"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Tummempi"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "Näet kaikki komentorivivalitsimet komennolla “%s --help”"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Vaaleampi"
+#~ msgid "Front and Back"
+#~ msgstr "Etu- ja takapuoli"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Vähemmän"
+#~ msgid "New"
+#~ msgstr "Uusi"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Enemmän"
+#~ msgid "Rotate Left"
+#~ msgstr "Kierrä vasemmalle"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Heikompi"
+#~ msgid "Rotate Right"
+#~ msgstr "Kierrä oikealle"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Parempi"
+#~ msgid "Crop"
+#~ msgstr "Rajaa"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Tallennetaan asiakirjaa..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Lue lähtee_stä:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Tallennetaan sivua %d/%d"
+#~ msgid "New Document"
+#~ msgstr "Uusi asiakirja"
+
+#~ msgid "Document"
+#~ msgstr "Asiakirja"
+
+#~ msgid "Email..."
+#~ msgstr "Sähköposti..."
+
+#~ msgid "Print..."
+#~ msgstr "Tulosta..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Asenna ajurit"
+
+#~ msgid "Minimum"
+#~ msgstr "Heikompi"
+
+#~ msgid "Maximum"
+#~ msgstr "Parempi"
+
+#~ msgid "Saving document..."
+#~ msgstr "Tallennetaan asiakirjaa..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Tallennetaan sivua %d/%d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -781,42 +1143,24 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "  --gtk-module=MODUULIT           Lataa lisäksi GTK+-moduulit\n"
 #~ "  --g-fatal-warnings              Tee kaikista varoituksista kuolettavia"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Laite jolta luetaan"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Lukemisen suunta"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-laite jolta kuvat luetaan."
-
 #~ msgid "Files missing"
 #~ msgstr "Tiedostoja puuttuu"
 
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Luetun kuvan korkeus pikseleissä"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Tarkkuus tekstin lukemiseen"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Tarkkuus valokuvien luvulle"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Viimeisimmän luetun kuvan tarkkuus"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Kansio, johon tiedostot tallennetaan"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Ikkunan korkeus pikseleinä"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Ikkunan leveys pikseleinä"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Kuvanlukuasiakirja"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Valitse tiedosto_tyyppi"
 
@@ -826,7 +1170,6 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Arvo TOSI, jos sovelluksen ikkuna on suurennettu"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -838,64 +1181,34 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Luettavan kuvan korkeus pikseleinä. Arvo päivittyy viimeisimmän luetun sivun "
-#~ "mukaan."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Kansio, johon tiedostot tallennetaan. Oletusasetus on Asiakirjat-kansio."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Luettavan asiakirjan tyyppi"
+#~ "Luettavan kuvan korkeus pikseleinä. Arvo päivittyy viimeisimmän luetun "
+#~ "sivun mukaan."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Luettavan kuvan leveys pikseleinä"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
 #~ "Skannattavan kuvan leveys pikseleinä. Arvo päivittyy viimeksi skannatun "
 #~ "sivun mukaan."
 
-#~ msgid "Page side to scan"
-#~ msgstr "Skannattava puoli"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Paperin pituus kymmenesosamilleinä"
-
-#~ 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 ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Paperin pituus kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
-#~ "varten)."
-
-#~ msgid ""
-#~ "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)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Paperin leveys kymmenesosamilleinä"
+#~ "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."
+#~ "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"
@@ -911,50 +1224,17 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "  --help-all Näytä kaikki apuvalinnat\n"
 #~ "  --help-gtk Näytä kaikki GTK+-valinnat"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa kuvia."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa tekstiä."
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Viimeksi skannatun kuvan resoluutio pisteinä tuumaa kohti."
 
 #~ 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')"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
+#~ "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 ""
-#~ "Luettavan asiakirjan tyyppi. Tämä asetus määrittää tarkkuuden, värit ja "
-#~ "jälkiprosessoinnin."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Skannattavan sivun puoli."
+#~ "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')"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skannerin kulkusuunta skannattavan sivun suhteen."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "JPEG-pakkaukseen käytettävä laatuarvo."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "JPEG-pakkaukseen käytettävä laatuarvo"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kirkkaussäätö asteikolla -100 - 100 (0 on ei yhtään)"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrastisäätö asteikolla -100 - 100 (0 on ei yhtään)"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Kuvanluvun kirkkaus"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kuvanluvun kontrasti"
diff --git a/po/fr.gmo b/po/fr.gmo
deleted file mode 100644
index 8ea7963..0000000
--- a/po/fr.gmo
+++ /dev/null
diff --git a/po/fr.po b/po/fr.po
index 87d326d..d9308fb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,519 +6,530 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-08-14 10:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-22 16:58+0200\n"
 "Last-Translator: Anne017 <anneonyme017@openmailbox.org>\n"
 "Language-Team: French <fr@li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoriser"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Numériser depuis"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Utilisateur :"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Périphérique SANE à utiliser pour l’acquisition des images."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Mot de passe :"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Type de document numérisé"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Recto-verso"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Type de document numérisé. Ce réglage définit la résolution de numérisation, "
+"les couleurs et le post-traitement."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Recto"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Largeur du papier en dixièmes de mm."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Verso"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
+"du papier)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Hauteur du papier en dixièmes de mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height 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 "
+"du papier)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Luminosité de la numérisation"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "L’ajustement de la luminosité de -100 à 100 (0 pour aucun)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contraste de la numérisation"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "L’ajustement du contraste de -100 à 100 (0 pour aucun)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Résolution des numérisations de textes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Résolution des numérisations de photos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Face de la page à numériser"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "La face de la page à numériser."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Dossier dans lequel les fichiers sont enregistrés"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Le dossier dans lequel les fichiers sont enregistrés. S’il n’est pas défini, "
+"le dossier « Documents » sera utilisé par défaut."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Taux de qualité à utiliser pour la compression JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Taux de qualité à utiliser pour la compression JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Délai en millisecondes entre les pages"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Délai en millisecondes entre les pages."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Outil de numérisation Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Numériser des documents"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Nu_mériser"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Une façon très simple de numériser à la fois documents et photos. Vous "
+"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
+"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
+"les enregistrer dans d’autres formats d’image."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
+"la plupart des périphériques de numérisation existants."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Numériseur de documents"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "numériser;scanner;numériseur;à plat;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Page unique"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Toutes les pages du _chargeur"
+msgstr "Toutes les pages du _bac d’alimentation"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Arrêter la numérisation"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pages _multiples depuis un numériseur à plat"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Texte"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Photo"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Nu_mériser"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Arrêter la numérisation"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Réorganiser les pages"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Courriel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Faire pivoter vers la _gauche"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Faire pivoter vers la _droite"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "Re_cadrer"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "Aucu_n"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personnalisé"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Faire pivote_r la sélection"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Déplacer vers la gauche"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Déplacer vers la droite"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Aide"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Contenus"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Créer un nouveau document"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nouveau"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Numériser une seule page depuis le périphérique de numérisation"
+msgstr "Numériser une seule page depuis le numériseur"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Numériser"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Enregistrer"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Arrêter la numérisation en cours"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Arrêter"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Faire pivoter vers la gauche"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Faire pivoter la page vers la droite (sens horaire)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Faire pivoter vers la droite"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recadrer la page sélectionnée"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recadrer"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Préférences"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "S_ource de numérisation :"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Résolution pour le _texte :"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Résolution de la _photo :"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Face à numériser :"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Taille de la page :"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Luminosité :"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste :"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Recherche de périphériques de numérisation…."
 
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualité :"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Numériseur de documents"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Numériser des documents"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Fermer"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "numériser;scanner;numériseur;à plat;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Nom d’utilisateur et mot de passe nécessaires pour accéder à « %s »"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "numériseur"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Prêt à numériser"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Une façon très simple de numériser à la fois documents et photos. Vous "
-"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
-"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
-"les enregistrer dans d'autres formats d'image."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Logiciel supplémentaire nécessaire"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
-"la plupart des périphériques de numérisation existants."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Impossible de se connecter au périphérique de numérisation"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Impossible de démarrer la numérisation"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-msgid "Error communicating with scanner"
-msgstr "Erreur de communication avec le périphérique de numérisation"
-
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "Afficher les informations de version"
-
-#. 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.vala:391
-msgid "Failed to scan"
-msgstr "Échec de la numérisation"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] - Outil de numérisation"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Exécutez « %s --help » pour voir la liste complète des options disponibles "
-"en ligne de commande."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Fermer"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Nom d'utilisateur et mot de passe nécessaires pour accéder à « %s »"
+"Vous devez <a href=\"install-firmware\">installer le logiciel du pilote</a> de votre périphérique de "
+"numérisation."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Aucun périphérique de numérisation n'a été détecté."
+msgstr "Aucun périphérique de numérisation n’a été détecté."
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Veuillez vérifier que votre périphérique de numérisation est connecté et "
 "sous tension."
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Logiciel supplémentaire nécessaire"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Vous devez installer le logiciel du pilote de votre scanner."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Enregistrer sous..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Enregistrer sous…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Enregistrer"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Document numérisé.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Fichiers image"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipage)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (compressé)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format du fichier :"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compression :"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Un fichier nommé « %s » existe déjà. Souhaitez-vous le remplacer ?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Remplacer"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Enregistrement"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
-msgstr "Impossible d'enregistrer le fichier"
+msgstr "Impossible d’enregistrer le fichier"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
 msgstr ""
-"Si vous n'enregistrez pas, les modifications seront définitivement perdues."
+"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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Enregistrer le document actuel ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Contact du périphérique de numérisation…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Impossible d'enregistrer l'image pour la prévisualiser"
+msgstr "Impossible d’enregistrer l’image pour la prévisualiser"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
-msgstr "Impossible d'ouvrir l'aperçu de l'image"
+msgstr "Impossible d’ouvrir l’aperçu de l’image"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Associer les côtés"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Associer les côtés (inverser)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Inverser"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Maintenir inchangé"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
-msgstr "Impossible d'ouvrir le fichier d'aide"
+msgstr "Impossible d’ouvrir le fichier d’aide"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -538,26 +549,26 @@ msgstr ""
 "par la Free Software Foundation, dans sa version 3 ou supérieure\n"
 "(selon votre choix).\n"
 "\n"
-"Ce programme est distribué dans l'espoir d'être utile, mais\n"
+"Ce programme est distribué dans l’espoir d’être utile, mais\n"
 "SANS AUCUNE GARANTIE, y compris les garanties de \n"
-"COMMERCIALISATION ou d'ADAPTATION À UN BUT SPÉCIFIQUE.\n"
+"COMMERCIALISATION ou d’ADAPTATION À UN BUT SPÉCIFIQUE.\n"
 "Consultez la licence publique générale GNU pour plus de détails.\n"
 "\n"
 "Vous devez avoir reçu une copie de la licence publique générale GNU\n"
-"en même temps que ce programme ; si ce n'est pas le cas, consultez\n"
+"en même temps que ce programme ; si ce n’est pas le cas, consultez\n"
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -597,405 +608,464 @@ msgstr ""
 "  torglut https://launchpad.net/~torglut"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Enregistrer le document avant de quitter ?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Il semblerait que vous ayez un scanner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://support.brother.com\">site Web de Brother</a>."
+"Les pilotes sont disponibles sur le <a href=\"http://support.brother.com"
+"\">site Web de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Il semblerait que vous ayez un scanner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://samsung.com/support\">site Web de Samsung</a>."
+"Les pilotes sont disponibles sur le <a href=\"http://samsung.com/support"
+"\">site Web de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Il semblerait que vous ayez un scanner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Il semblerait que vous ayez un scanner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://support.epson.com\">site web d'Epson</a>."
+"Les pilotes sont disponibles sur le <a href=\"http://support.epson.com"
+"\">site web d’Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Installer les pilotes"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Une fois installés, vous devrez redémarrer Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Installation des pilotes..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Installation des pilotes…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Pilotes installés avec succès !"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Impossible d'installer les pilotes (code d'erreur %d)."
+msgstr "Impossible d’installer les pilotes (code d’erreur %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr "Impossible d'installer les pilotes."
+msgstr "Impossible d’installer les pilotes."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Vous devez installer le(s) paquet(s) %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Vous devez installer le paquet %s."
+msgstr[1] "Vous devez installer les paquets %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Préférences"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (par défaut)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Raccourcis clavier"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d ppp (brouillon)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Aide"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d ppp (haute résolution)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "À propos"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Quitter"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Courriel"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Recommencer…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Faire pivoter la page vers la droite (sens horaire)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Recadrer la page sélectionnée"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Supprimer la page sélectionnée"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Annuler"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autoriser"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Utilisateur :"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Mot de passe :"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
+msgid "Unable to encode page %i"
+msgstr "Impossible d’encoder la page %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Numérisation"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Numériser une seule page"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Numériser toutes les pages depuis le bac d’alimentation du numériseur"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Numériser en continuer depuis le numériseur"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stopper la numérisation en cours"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modification du document"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Déplacer la page vers la gauche"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Déplacer la page vers la droite"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nouveau document"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Faire pivoter la page vers la droite (sens horaire)"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Supprimer la page"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Courriel..."
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestion de documents"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimer..."
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Créer un nouveau document"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Aide"
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Sauvegarder le document numérisé"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "À propos"
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Envoyer par courriel le document numérisé"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Quitter"
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimer le document numérisé"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copier la page courante dans le presse-papier"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Changer de _périphérique de numérisation"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Numériseur"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Faces à numériser"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installer les pilotes"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Taille de la page"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Recto"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Verso"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Recto-verso"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Délai"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Pages multiples depuis un numériseur à plat"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Secondes"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Numérisation"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Résolution du _texte"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Résolution de la _photo"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Luminosité"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contraste"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualité"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Plus"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (par défaut)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ppp (brouillon)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Enregistrement du document..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ppp (haute résolution)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Enregistrement de la page %d sur %d"
+msgid "%d dpi"
+msgstr "%d ppp"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Veuillez vérifier votre installation"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+"Aucun périphérique de numérisation disponible. Veuillez en connecter un."
 
-#~ msgid "Files missing"
-#~ msgstr "Fichiers manquants"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Impossible de se connecter au périphérique de numérisation"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Usage :\n"
-#~ "  %s [PÉRIPHÉRIQUE...] - utilitaire de numérisation"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Impossible de démarrer la 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"
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Hauteur de la fenêtre en pixels"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Largeur de la fenêtre en pixels"
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "VRAI si la fenêtre de l'application est maximisée"
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Hauteur de l'image numérisée en pixels"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Résolution de la dernière image numérisée"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Numériser depuis"
-
-#~ msgid "Direction of scan"
-#~ msgstr "Sens de numérisation"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Erreur de communication avec le périphérique de numérisation"
 
-#, 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 "Scanned Document"
-#~ msgstr "Document numérisé"
-
-#~ 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 "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."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Largeur de l'image numérisée en pixels"
-
-#~ 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 "Select File _Type"
-#~ msgstr "Sélectionner le _type de fichier"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Hauteur du papier en dixièmes de mm"
-
-#~ 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 »"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
-#~ "du papier)."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Face(s) de la page à numériser"
-
-#~ msgid ""
-#~ "The height 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 "
-#~ "du papier)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Largeur du papier en dixièmes de mm."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Dossier dans lequel les fichiers sont enregistrés"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Type de document numérisé. Ce réglage définit la résolution de numérisation, "
-#~ "les couleurs et le post-traitement."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Le sens du scanner par rapport à la page numérisée."
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Résolution des numérisations de textes"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Résolution des numérisations de photos"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustement du contraste de -100 à 100 (0 pour aucun)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste de la numérisation"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustement de la luminosité de -100 à 100 (0 pour aucun)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Luminosité de la numérisation"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Taux de qualité à utiliser pour la compression JPEG"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Taux de qualité à utiliser pour la compression JPEG."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type de document numérisé"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Afficher les informations de version"
 
-#~ msgid "The page side to scan."
-#~ msgstr "La face de la page à numériser."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Afficher les messages de débogage"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Le dossier dans lequel les fichiers sont enregistrés. S'il n'est pas défini, "
-#~ "le dossier « Documents » sera utilisé par défaut."
+#: 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.vala:392
+msgid "Failed to scan"
+msgstr "Échec de la numérisation"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Numérisation en cours"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] - Outil de numérisation"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Exécutez « %s --help » pour voir la liste complète des options disponibles "
+"en ligne de commande."
diff --git a/po/fr_CA.gmo b/po/fr_CA.gmo
deleted file mode 100644
index 636fcad..0000000
--- a/po/fr_CA.gmo
+++ /dev/null
diff --git a/po/fr_CA.po b/po/fr_CA.po
deleted file mode 100644
index d71d9bc..0000000
--- a/po/fr_CA.po
+++ /dev/null
@@ -1,843 +0,0 @@
-# French (Canada) translation for simple-scan
-# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
-# This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-04-13 19:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French (Canada) <fr_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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
-
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoriser"
-
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Utilisateur :"
-
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Mot de passe :"
-
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Recto-verso"
-
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Recto"
-
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Verso"
-
-#. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
-msgid "Simple Scan"
-msgstr "Outil de numérisation Simple Scan"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
-
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Nu_mériser"
-
-#. Scan menu item to scan a single page from the scanner
-#. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
-msgid "Single _Page"
-msgstr "_Page unique"
-
-#. Scan menu item to scan all pages from a document feeder
-#. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
-msgid "All Pages From _Feeder"
-msgstr "Toutes les pages du _bac"
-
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Arrêter la numérisation"
-
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
-msgid "Text"
-msgstr "Texte"
-
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
-msgid "Photo"
-msgstr "Photo"
-
-#. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
-msgid "Reorder Pages"
-msgstr "Réorganiser les pages"
-
-#. Label on email menu item
-#: data/simple-scan.ui:367
-msgid "_Email"
-msgstr "_Courriel"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
-msgid "_Page"
-msgstr "_Page"
-
-#. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
-msgid "Rotate _Left"
-msgstr "Faire pivoter vers la _gauche"
-
-#. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
-msgid "Rotate _Right"
-msgstr "Faire pivoter vers la _droite"
-
-#. Label for page crop submenu
-#: data/simple-scan.ui:460
-msgid "_Crop"
-msgstr "Re_cadrer"
-
-#. Radio button for no crop
-#: data/simple-scan.ui:470
-msgid "_None"
-msgstr "Aucu_n"
-
-#. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
-msgid "A_4"
-msgstr "A_4"
-
-#. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
-msgid "A_5"
-msgstr "A_5"
-
-#. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
-msgid "A_6"
-msgstr "A_6"
-
-#. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
-msgid "_Letter"
-msgstr "_Letter (US)"
-
-#. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
-msgid "Le_gal"
-msgstr "_Legal (US)"
-
-#. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
-msgid "4×6"
-msgstr "4 × 6"
-
-#. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
-msgid "_Custom"
-msgstr "_Personnalisé"
-
-#. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
-msgid "_Rotate Crop"
-msgstr "Faire pivote_r la sélection"
-
-#. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
-msgid "Move Left"
-msgstr "Déplacer vers la gauche"
-
-#. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
-msgid "Move Right"
-msgstr "Déplacer vers la droite"
-
-#. Label on help menu
-#: data/simple-scan.ui:624
-msgid "_Help"
-msgstr "_Aide"
-
-#. Help|Contents menu
-#: data/simple-scan.ui:632
-msgid "_Contents"
-msgstr "_Contenus"
-
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Créer un nouveau document"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nouveau"
-
-#. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
-msgid "Scan a single page from the scanner"
-msgstr "Numériser une seule page depuis le périphérique de numérisation"
-
-#. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
-msgid "Scan"
-msgstr "Numériser"
-
-#. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
-msgid "Save document to a file"
-msgstr "Enregistrer le document dans un fichier"
-
-#: ../src/ui.vala:1842
-msgid "Save"
-msgstr "Enregistrer"
-
-#. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
-msgid "Stop the current scan"
-msgstr "Arrêter la numérisation en cours"
-
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
-msgid "Stop"
-msgstr "Arrêter"
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Faire pivoter vers la gauche"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Faire pivoter la page vers la droite (sens horaire)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Faire pivoter vers la droite"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recadrer la page sélectionnée"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recadrer"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Préférences"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "S_ource de numérisation :"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Résolution pour le _texte :"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Résolution de la _photo :"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Face à numériser :"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Taille de la page :"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Luminosité :"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste :"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualité :"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Numériseur de documents"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Numériser des documents"
-
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "numériser;scanner;numériseur;à plat;adf;"
-
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Une façon très simple de numériser à la fois documents et photos. Vous "
-"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
-"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
-"les enregistrer dans d'autres formats d'image."
-
-#: data/simple-scan.appdata.xml.in:13
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
-"la plupart des périphériques de numérisation existants."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Impossible de se connecter au périphérique de numérisation"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Impossible de démarrer la numérisation"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-msgid "Error communicating with scanner"
-msgstr "Erreur de communication avec le périphérique de numérisation"
-
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "Afficher les informations de version"
-
-#. 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.vala:391
-msgid "Failed to scan"
-msgstr "Échec de la numérisation"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] - Outil de numérisation"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Exécutez « %s --help » pour voir la liste complète des options disponibles "
-"en ligne de commande."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Fermer"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, 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.vala:375
-msgid "No scanners detected"
-msgstr "Aucun périphérique de numérisation n'a été détecté."
-
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
-msgid "Please check your scanner is connected and powered on"
-msgstr ""
-"Veuillez vérifier que votre périphérique de numérisation est connecté et "
-"sous tension."
-
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Logiciel supplémentaire nécessaire"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Vous devez installer le logiciel du pilote de votre scanner."
-
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Enregistrer sous..."
-
-#: ../src/ui.vala:509 ../src/ui.vala:675
-msgid "_Cancel"
-msgstr "_Annuler"
-
-#: ../src/ui.vala:510 ../src/ui.vala:676
-msgid "_Save"
-msgstr "_Enregistrer"
-
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
-msgid "Scanned Document.pdf"
-msgstr "Document numérisé.pdf"
-
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
-msgid "Image Files"
-msgstr "Fichiers image"
-
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
-msgid "All Files"
-msgstr "Tous les fichiers"
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
-msgid "PDF (multi-page document)"
-msgstr "PDF (document multipage)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
-msgid "JPEG (compressed)"
-msgstr "JPEG (compressé)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
-msgid "PNG (lossless)"
-msgstr "PNG (sans perte)"
-
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
-msgid "File format:"
-msgstr "Format du fichier :"
-
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
-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.vala:673
-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.vala:708
-msgid "Save current document?"
-msgstr "Enregistrer le document actuel ?"
-
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
-msgid "Discard Changes"
-msgstr "Abandonner les modifications"
-
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
-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.vala:1004
-msgid "Unable to open image preview application"
-msgstr "Impossible d'ouvrir l'aperçu de l'image"
-
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
-msgid "Combine sides"
-msgstr "Associer les côtés"
-
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
-msgid "Combine sides (reverse)"
-msgstr "Associer les côtés (inverser)"
-
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
-msgid "Reverse"
-msgstr "Inverser"
-
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
-msgid "Keep unchanged"
-msgstr "Maintenir inchangé"
-
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
-msgid "Unable to open help file"
-msgstr "Impossible d'ouvrir le fichier d'aide"
-
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
-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 ""
-"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
-"selon les termes de la licence publique générale (GPL) GNU publiée\n"
-"par la Free Software Foundation, dans sa version 3 ou supérieure\n"
-"(selon votre choix).\n"
-"\n"
-"Ce programme est distribué dans l'espoir d'être utile, mais\n"
-"SANS AUCUNE GARANTIE, y compris les garanties de \n"
-"COMMERCIALISATION ou d'ADAPTATION À UN BUT SPÉCIFIQUE.\n"
-"Consultez la licence publique générale GNU pour plus de détails.\n"
-"\n"
-"Vous devez avoir reçu une copie de la licence publique générale GNU\n"
-"en même temps que ce programme ; si ce n'est pas le cas, consultez\n"
-"<http://www.gnu.org/licenses/>."
-
-#. Title of about dialog
-#: ../src/ui.vala:1475
-msgid "About Simple Scan"
-msgstr "À propos de Simple Scan"
-
-#. Description of program
-#: ../src/ui.vala:1478
-msgid "Simple document scanning tool"
-msgstr "Numériser simplement vos documents"
-
-#: ../src/ui.vala:1487
-msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Mathieu Marin https://launchpad.net/~rama-197"
-
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
-msgid "Save document before quitting?"
-msgstr "Enregistrer le document avant de quitter ?"
-
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
-msgid "Quit without Saving"
-msgstr "Quitter sans enregistrer"
-
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
-msgid "You appear to have a Brother scanner."
-msgstr "Il semblerait que vous ayez un scanner Brother."
-
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
-msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
-msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://support.brother.com\">site Web de Brother</a>."
-
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
-msgid "You appear to have a Samsung scanner."
-msgstr "Il semblerait que vous ayez un scanner Samsung."
-
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
-msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
-msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://samsung.com/support\">site Web de Samsung</a>."
-
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
-msgid "You appear to have an HP scanner."
-msgstr "Il semblerait que vous ayez un scanner HP."
-
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
-msgid "You appear to have an Epson scanner."
-msgstr "Il semblerait que vous ayez un scanner Epson."
-
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
-msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
-msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://support.epson.com\">site web d'Epson</a>."
-
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
-msgid "Install drivers"
-msgstr "Installer les pilotes"
-
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
-msgid "Once installed you will need to restart Simple Scan."
-msgstr "Une fois installés, vous devrez redémarrer Simple Scan."
-
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Installation des pilotes..."
-
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
-msgid "Drivers installed successfully!"
-msgstr "Pilotes installés avec succès !"
-
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
-#, c-format
-msgid "Failed to install drivers (error code %d)."
-msgstr "Impossible d'installer les pilotes (code d'erreur %d)."
-
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
-msgid "Failed to install drivers."
-msgstr "Impossible d'installer les pilotes."
-
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
-#, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Vous devez installer le(s) paquet(s) %s."
-
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (par défaut)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d ppp (brouillon)"
-
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d ppp (haute résolution)"
-
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
-#, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nouveau document"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Courriel..."
-
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimer..."
-
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Aide"
-
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "À propos"
-
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Quitter"
-
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Changer de _périphérique de numérisation"
-
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installer les pilotes"
-
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatique"
-
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Plus foncé"
-
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Plus clair"
-
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Moins"
-
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Plus"
-
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
-
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
-
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Enregistrement du document..."
-
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Enregistrement de la page %d sur %d"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Numériser depuis"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type de document numérisé"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Type de document numérisé. Ce réglage définit la résolution de numérisation, "
-#~ "les couleurs et le post-traitement."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Largeur du papier en dixièmes de mm."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
-#~ "du papier)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Hauteur du papier en dixièmes de mm"
-
-#~ msgid ""
-#~ "The height 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 "
-#~ "du papier)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Luminosité de la numérisation"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustement de la luminosité de -100 à 100 (0 pour aucun)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste de la numérisation"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustement du contraste de -100 à 100 (0 pour aucun)."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Résolution des numérisations de textes"
-
-#~ 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."
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Résolution des numérisations de photos"
-
-#~ 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."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Face(s) de la page à numériser"
-
-#~ msgid "The page side to scan."
-#~ msgstr "La face de la page à numériser."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Dossier dans lequel les fichiers sont enregistrés"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Le dossier dans lequel les fichiers sont enregistrés. S'il n'est pas défini, "
-#~ "le dossier « Documents » sera utilisé par défaut."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Taux de qualité à utiliser pour la compression JPEG"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Taux de qualité à utiliser pour la compression JPEG."
diff --git a/po/fur.po b/po/fur.po
new file mode 100644
index 0000000..acc1237
--- /dev/null
+++ b/po/fur.po
@@ -0,0 +1,1070 @@
+# Friulian translation for simple-scan.
+# Copyright (C) 2017 simple-scan's COPYRIGHT HOLDER
+# This file is distributed under the same license as the simple-scan package.
+# Fabio Tomat <f.t.public@gmail.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan master\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-09 12:26+0200\n"
+"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
+"Language-Team: Friulian <fur@li.org>\n"
+"Language: fur\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositîf di dulà scansionâ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositîf SANE dulà acuisî imagjins."
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Gjenar di document di scansionâ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Gjenar di document di scansionâ. Cheste impostazion e decît su la risoluzion "
+"di scansion, colôrs e la post-produzion."
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Largjece de cjarte in decims di mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La largjece de cjarte in decims di mm (o 0 pal rilevament automatic de "
+"cjarte)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Altece de cjarte in decims di mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La altece de cjarte in decims di mm (o 0 pal rilevament automatic de cjarte)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Luminositât de scansion"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "La justade de luminositât, di -100 a 100 (0 par nissune)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrast de scansion"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "La justade dal contrast, di -100 a 100 (0 par nissune)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Risoluzion pes scansions di test"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "La risoluzion in ponts-par-once di doprâ tal scansionâ test."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Risoluzion pes scansions di foto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "La risoluzion in ponts-par-once di doprâ tal scansionâ fotos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Bande de pagjine di scansionâ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "La façade de pagjine di scansionâ."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Cartele dulà salvâ i file"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"La cartele dulà salvâ i file. Se nol è stabilît, in maniere predefinide al "
+"ponte ae cartele dai documents."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Valôr de cualitât di doprâ pe compression JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Valôr de cualitât di doprâ pe compression JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Ritart in miliseconts tra lis pagjinis"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Ritart in miliseconts tra lis pagjinis."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
+msgid "Simple Scan"
+msgstr "Scansion Semplice"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Scansione documents"
+
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Une maniere une vore facile par scansionâ documents e fotos. Al è pussibil "
+"taiâ vie lis parts brutis di une foto e zirâle se e je voltade de bande "
+"sbaliade. Si pues stampâ lis scansions, espuartâlis su pdf o salvâlis intune "
+"schirie di formâts imagjin."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Scansion Semplice al dopre il framework SANE par supuartâ la plui parte dai "
+"scansionadôrs esistents."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Scansionadôr di document"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scansion;scanner;scansionadôr;plan;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+msgid "Single _Page"
+msgstr "_Pagjine singule"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+msgid "All Pages From _Feeder"
+msgstr "_Dutis lis pagjinis dal cjariadôr"
+
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pagjinis _multiplis dal plan di scansion"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+msgid "Text"
+msgstr "Test"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+msgid "Photo"
+msgstr "Foto"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sc_ansione"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Ferme la scansion"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+msgid "Reorder Pages"
+msgstr "Torne ordene lis pagjinis"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "_E-mail"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "_Pagjine"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "Ribalte a _çampe"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "Ribalte a _drete"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "Rifi_le"
+
+# rifiladure
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "_Nissune"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+msgid "4×6"
+msgstr "4×6"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:397
+msgid "_Custom"
+msgstr "_Personalizât"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:415
+msgid "_Rotate Crop"
+msgstr "_Volte rifiladure"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:428
+msgid "Move Left"
+msgstr "Sposte a çampe"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:437
+msgid "Move Right"
+msgstr "Sposte a drete"
+
+#. Label on help menu
+#: src/app-window.ui:474
+msgid "_Help"
+msgstr "_Jutori"
+
+#. Help|Contents menu
+#: src/app-window.ui:482
+msgid "_Contents"
+msgstr "_Contignûts"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:520 src/app-window.ui:720
+msgid "Scan a single page from the scanner"
+msgstr "Scansione une singule pagjine dal scansionadôr"
+
+#. Label on scan toolbar item
+#: src/app-window.ui:522 src/app-window.ui:716
+msgid "Scan"
+msgstr "Scansione"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:538 src/app-window.ui:787
+msgid "Save document to a file"
+msgstr "Salve il document suntun file"
+
+#: src/app-window.ui:540
+msgid "Save"
+msgstr "Salve"
+
+#. Tooltip for stop button
+#: src/app-window.ui:555 src/app-window.ui:700
+msgid "Stop the current scan"
+msgstr "Ferme la scansion atuâl"
+
+#: src/app-window.ui:556 src/app-window.ui:697
+msgid "Stop"
+msgstr "Ferme"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Daûr a cirî scansionadôrs…"
+
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Siere"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Non utent e password necessaris par acedi a “%s”"
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Pront pe scansion"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Software adizionâl necessari"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+"Si scugne <a href=\"install-firmware\">instalâ il software dal driver</a> "
+"pal scansionadôr."
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:281
+msgid "No scanners detected"
+msgstr "Nissun scansionadôr rilevât"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:283
+msgid "Please check your scanner is connected and powered on"
+msgstr "Controle che il scansionadôr al sedi tacât e impiât"
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Salve come…"
+
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+msgid "_Cancel"
+msgstr "_Anule"
+
+#: src/app-window.vala:302 src/app-window.vala:553
+msgid "_Save"
+msgstr "_Salve"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:310
+msgid "Scanned Document.pdf"
+msgstr "Document scansionât.pdf"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
+msgid "Image Files"
+msgstr "File imagjin"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:326
+msgid "All Files"
+msgstr "Ducj i file"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:335
+msgid "PDF (multi-page document)"
+msgstr "PDF (document a plui pagjinis)"
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:341
+msgid "JPEG (compressed)"
+msgstr "JPEG (comprimût)"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:347
+msgid "PNG (lossless)"
+msgstr "PNG (cence pierditis)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimût)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
+msgid "File format:"
+msgstr "formât file:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compression:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Un file clamât “%s” al esist za.  Vuelistu sostituîlu?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Sostituìs"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Daûr a salvâ"
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:527
+msgid "Failed to save file"
+msgstr "No si è rivâts a salvâ il file"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Se no si salve, lis modifichis a laran pierdudis par simpri."
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:591
+msgid "Save current document?"
+msgstr "Salvâ il document atuâl?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:593
+msgid "Discard Changes"
+msgstr "Scarte modifichis"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Daûr a contatâ il scansionadôr…"
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:800
+msgid "Unable to save image for preview"
+msgstr "Impussibil salvâ la imagjin pe anteprime"
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:812
+msgid "Unable to open image preview application"
+msgstr "Impussibil vierzi la aplicazion pe anteprime de imagjin"
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:990
+msgid "Combine sides"
+msgstr "Cumbine bandis"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1000
+msgid "Combine sides (reverse)"
+msgstr "Cumbine bandis (inviers)"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1010
+msgid "Reverse"
+msgstr "Inviers"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1020
+msgid "Keep unchanged"
+msgstr "Lasse no modificât"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1250
+msgid "Unable to open help file"
+msgstr "Impussibil vierzi il file di jutori"
+
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1271
+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 ""
+"Chest program al è software libar; si pues tornâ a distribuîlu e/o "
+"modificâlu\n"
+"sot i tiermins de licence GNU General Public come publicade de\n"
+"Free Software Foundation, sedi la version 3 de licence o (a to sielte)\n"
+"cualsisei version sucessive.\n"
+"\n"
+"Chest program al è distribuît inte sperance che al sedi util,\n"
+"ma CENCE NISSUNE GARANZIE; cence nancje la implicite garanzie di\n"
+"CUMIERÇABILITÂT o IDONEITÂT A UNE FINALITÂT PARTICOLÂR. Viôt la\n"
+"licence GNU General Public par vê plui detais.\n"
+"\n"
+"O varessis di vê ricevût une copie de licence GNU General Public adun\n"
+"cun chest program. In câs contrari, visite <http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: src/app-window.vala:1274
+msgid "About Simple Scan"
+msgstr "Informazions su Scansion Semplice"
+
+#. Description of program
+#: src/app-window.vala:1277
+msgid "Simple document scanning tool"
+msgstr "Sempliç strument par scansionâ documents"
+
+#: src/app-window.vala:1286
+msgid "translator-credits"
+msgstr "Fabio Tomat <f.t.public@gmail.com>"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1308
+msgid "Save document before quitting?"
+msgstr "Salvâ il document prime di jessî?"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
+msgid "Quit without Saving"
+msgstr "Jes cence salvâ"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1357
+msgid "You appear to have a Brother scanner."
+msgstr "Al semee che tu vedis un scansionadôr Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1359
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+"I driver par chest dispositîf a son disponibii sul <a href=\"http://support."
+"brother.com\">sît web de Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: src/app-window.vala:1363
+msgid "You appear to have a Samsung scanner."
+msgstr "Al semee che tu vedis un scansionadôr Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1365
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+"I driver par chest dispositîf a son disponibii sul <a href=\"http://samsung."
+"com/support\">sît web de Samsung</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: src/app-window.vala:1369
+msgid "You appear to have an HP scanner."
+msgstr "Al semee che tu vedis un scansionadôr HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have an Epson scanner."
+msgstr "Al semee che tu vedis un scansionadôr Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1376
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+"I driver par chest dispositîf a son disponibii sul <a href=\"http://support."
+"epson.com\">sît web de Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: src/app-window.vala:1380
+msgid "Install drivers"
+msgstr "Instale driver"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1411
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Une volte instalât si scugne tornâ a inviâ Scansion Semplice."
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Daûr a instalâ i driver…"
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1431
+msgid "Drivers installed successfully!"
+msgstr "Driver instalâts cun sucès!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1441
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "No si è rivâts a instalâ i driver (codiç di erôr %d)."
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1447
+msgid "Failed to install drivers."
+msgstr "No si è rivâts a instalâ i driver."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Si scugne instalâ il pachet %s."
+msgstr[1] "Si scugne instalâ i pachets %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferencis"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Scurtis di tastiere"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Jutori"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Informazions"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Jes"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Torne tache…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Zire la pagjine a çampe (sens antiorari)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Zire la pagjine a drete (sens orari)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Rifile la pagjine selezionade"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Elimine la pagjine selezionade"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Anule"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorize"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Non utent pe risorse:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Password:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Impussibil codificâ la pagjine %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Scansion"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Scansione une singule pagjine"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Scansione dutis lis pagjinis dal alimentadôr di documents"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Scansione di un continui dal plan di scansionament"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Ferme la scansion in cors"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modifiche document"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Sposte pagjine a çampe"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Sposte pagjine a drete"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Zire pagjine a çampe (sens antiorari)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Zire pagjine a drete (sens orari)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Elimine pagjine"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gjestion document"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Tache un gnûf document"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Salve document scansionât"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-mail document scansionât"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Stampe document scansionât"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copie la pagjine atuâl tes notis"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Scansionadôr"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Bandis de scansion"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Dimension pagjine"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Denant"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Daûr"
+
+# lis bandis de pagjine
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Dutis dôs"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Ritart"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Pagjinis multiplis dal plan di scansion"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Seconts"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Scansion"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Risoluzion _test"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Risoluzion _foto"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Luminositât"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Cualitât"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatic"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Plui scûr"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Plui clâr"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Mancul"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Plui"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppo (predefinît)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ppo (stampon)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ppo (alte risoluzion)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d ppo"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nissun scansionadôr disponibil. Tache un scansionadôr."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Impussibil tacâsi a un scansionadôr"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Impussibil tacâ la scansion"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Erôr tal comunicâ cul scansionadôr"
+
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostre la version di publicazion"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Stampe messaçs di debug"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Comede i file PDF gjenerâts cun versions di Scansion Semplice plui vecjis"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "No si è rivâts a scansionâ"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Scansion in cors"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITÎF…] — utilitât di scansionament"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Eseguìs “%s --help” par viodi la liste di dutis lis opzions disponibilis te "
+"rie di comant."
+
+#~ msgid "Saving document…"
+#~ msgstr "Daûr a salvâ il document…"
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Daûr a salvâ la pagjine %d di %d"
+
+#~ msgid "Front and Back"
+#~ msgstr "Denant e daûr"
+
+#~ msgid "New"
+#~ msgstr "Gnûf"
+
+#~ msgid "Rotate Left"
+#~ msgstr "Ribalte a çampe"
+
+#~ msgid "Rotate Right"
+#~ msgstr "Ribalte a drete"
+
+#~ msgid "Crop"
+#~ msgstr "Rifile"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "S_orzint scansion:"
+
+#~ msgid "New Document"
+#~ msgstr "Gnûf document"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Email..."
+#~ msgstr "E-mail..."
+
+#~ msgid "Print..."
+#~ msgstr "Stampe..."
+
+#~ msgid "Minimum"
+#~ msgstr "Minim"
+
+#~ msgid "Maximum"
+#~ msgstr "Massim"
diff --git a/po/gd.gmo b/po/gd.gmo
deleted file mode 100644
index 4bb099f..0000000
--- a/po/gd.gmo
+++ /dev/null
diff --git a/po/gd.po b/po/gd.po
index a4b7340..39115ca 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: gd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Ùg_hdarraich"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_An t-ainm-cleachdaiche airson a' ghoireis:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Facal-faire:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "A h-aghaidh 's a cùl"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "A h-aghaidh"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "A cùl"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Sganadh simplidh"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Sgrìobhainn"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Sg_anaich"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "_Duilleag shingilte"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Gach duilleag a tha san _bhiathadair"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "Cuir _stad air an sganadh"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Teacsa"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Dealbh"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Atharraich òrdugh nan duilleagan"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Post-d"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Duilleag"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Cuairtich gu _tuathail"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Cuairtich gu _deiseil"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Bearr"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "Cha_n eil gin"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Litir"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Gnàthaichte"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Cuairtich an raon bearraidh"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Gluais gun taobh chlì"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Gluais gun taobh deas"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Cobhair"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Clàr-innse"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Tòisich air sgrìobhainn ùr"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Ùr"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "Sganaich duilleag shingilte on sganair"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Sganaich"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Sàbhail an sgrìobhainn mar fhaidhle"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Sàbhail"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Cuir stad air an sganadh làithreach"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Stad"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Cuairtich an duilleag gu tuathail"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Cuairtich gu tuathail"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Cuairtich an duilleag gu deiseil"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Cuairtich gu deiseil"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Bearr an duilleag a thagh thu"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Bearr"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Roghainnean"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Tùs an _sganaidh:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an teacsa:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an deilbh:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Sganaich taobh:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Meud na duilleige:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Soilleireachd:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Iomsgaradh:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Càileachd:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Sganair sgrìobhainnean"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Sganaich sgrìobhainnean"
 
@@ -308,7 +322,7 @@ msgstr "scan;scanner;flatbed;adf;sganair;sganaich;sganadh;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -321,7 +335,7 @@ msgstr ""
 "sganaich thu a chlò-bhualadh, às-phortadh gu PDF no a shàbhaladh ann an "
 "taghadh de fhòrmatan deilbh."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -329,65 +343,65 @@ msgstr ""
 "mhòrchuid a sganairean a tha ann."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Chan eil sganair sam bith ri làimh. Feuch is ceangail sganair ris."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Cha b' urrainn dhuinn ceangal ris an sganair."
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Cha b' urrainn tòiseachadh air an sganadh"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Thachair mearachd nuair a bha sinn a' conaltradh ris an sganair"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: 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
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Clò-bhuail teachdaireachdan dì-bhugachaidh"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Càirich faidhlichean PDF a chaidh a chruthachadh le seann-tionndaidhean dhe "
 "Sganadh simplidh"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Dh'fhàillig an sganadh"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Goireas sganaidh"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ruith \"%s --help\" airson liosta shlàn dhe na roghainnean command line a "
 "tha ri làimh fhaicinn."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "_Dùin"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
@@ -395,131 +409,142 @@ msgstr ""
 "\"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Cha deach sganair sam bith a lorg"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Dèan cinnteach gu bheil sganair ceangailte ris agus gu bheil e air"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr "Tha bathar-bog a dhìth"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr "Feumaidh tu bathar-bog draibheir a stàladh airson an sganair agad."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Sàbhail mar..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Sàbhail"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Sgrìobhainn sganaichte.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Faidhlichean deilbh"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Na h-uile faidhle"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF {sgrìobhainn ioma-dhuilleagach}"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (dùmhlaichte)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (gun chall càileachd)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "Fòrmat an fhaidhle:"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "Cha b' urrainn dhuinn a shàbhaladh ann am faidhle"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Mur an sàbhail thu e, thèid atharrachadh sam bith a rinn thu air chall."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "A bheil thu airson an sgrìobhainn làithreach a shàbhaladh?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Tilg air falbh na h-atharraichean"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "Cha ghabh an ìomhaigh a shàbhaladh airson a ro-shealladh"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Chan urrainn dhuinn an aplacaid fhosgladh a ro-sheallas an ìomhaigh"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "Cuir còmhla na duilleagan"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "Cuir còmhla na duilleagan (ann an òrdugh contrarra)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Contrarra"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Cum gun atharrachadh"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Chan urrainn dhuinn faidhle na cobharach fhosgladh"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -548,16 +573,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Mu dhèidhinn Sganadh simplidh"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Inneal simplidh airson sganadh sgrìobhainnean"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -566,22 +591,22 @@ msgstr ""
 "  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "A bheil thu airson an sgrìobhainn a shàbhaladh mus dèan sinn fàgail?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Fàg gun a shàbhaladh"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr "Tha coltas gu bheil sganair Brother agad."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -590,12 +615,12 @@ msgstr ""
 "href=\"http://support.brother.com\">làrach-lìn Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr "Tha coltas gu bheil sganair Samsung agad."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -604,17 +629,17 @@ msgstr ""
 "href=\"http://samsung.com/support\">làrach-lìn Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr "Tha coltas gu bheil sganair HP agad."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr "Tha coltas gu bheil sganair Epson agad."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -623,139 +648,139 @@ msgstr ""
 "href=\"http://support.epson.com\">làrach-lìn Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "Stàlaich na draibhearan"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Bidh Sganadh simplidh feumach air ath-thòiseachadh às dèidh seo a stàladh."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "A' stàladh nan draibhearan..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "Tha na draibhearan air an stàladh!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Cha deach leinn na draibhearan a stàladh (còd na mearachd: %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr "Cha deach leinn na draibhearan a stàladh."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Feumaidh tu a' phacaid / na pacaidean %s a stàladh."
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (bun-roghainn)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (dreachd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (dùmhlachd-bhreacaidh àrd)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Sgrìobhainn ùr"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Sgrìobhainn"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Post-d..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Clò-bhuail..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Cobhair"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Mu dhèidhinn"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Fàg an-seo"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Atharraich an _sganair"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "Stàlaich na dra_ibhearan"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Nas duirche"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Nas soilleire"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Nas lugha"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Barrachd"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "As lugha"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "As motha"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "A' sàbhaladh na sgrìobhainn..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A' sàbhaladh duilleag %d a-mach à %d"
diff --git a/po/gl.gmo b/po/gl.gmo
deleted file mode 100644
index 25d2021..0000000
--- a/po/gl.gmo
+++ /dev/null
diff --git a/po/gl.po b/po/gl.po
index 3282c5b..7125d6f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,517 +2,534 @@
 # 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.
-#
+# Fran Dieguez <frandieguez@gnome.org>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2013-10-05 07:56+0000\n"
-"Last-Translator: Fran Diéguez <Unknown>\n"
-"Language-Team: Galician <gl@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product"
+"=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-10 18:02+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
+"Language-Team: Galician\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Project-Style: gnome\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizar"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositivo desde o que escanear"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nome de _usuario para o recurso:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositivo SANE desde o que adquirir as imaxes."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Contrasinal:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipo de documento que está sendo escaneado"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Anverso e reverso"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipo de documento a escanear. Esta opción decide a resolución, cores e post-"
+"procesado do escaneado"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Anverso"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Largura do papel en décimas de mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Atrás"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Altura do papel en décimas de mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"A altura do papel en décimas de mm (ou 0 para a detección automática do "
+"papel)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brillo do escaneo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+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:40
+msgid "Contrast of scan"
+msgstr "Contraste do escaneo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Resolución para o escaneado de texto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolución para o escaneado de fotos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Cara da páxina a escanear"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "O lado da páxina a escanear."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directorio no que gardar os ficheiros"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Valor de calidade a usar na compresión JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Valor de calidade a usar na compresión JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Atraso en milisegundos entre as páxinas"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Atraso en milisegundos entre páxinas."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Escáner sinxelo"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Documento"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Escanear documentos"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Esc_anear"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Un xeito ben sinxelo de escanear documentos e imaxes. Pode recortar as "
+"partes malas dunha foto e rotala se está do revés. Pode imprimir os "
+"escaneos, exportalos a un PDF ou gardalos en varios formatos de imaxe."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Escáner Sinxelo usa o marco de traballo de SANE para ser compatíbel coa "
+"maioría de escáneres existentes."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Escáner de documentos"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "escanear;escáner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Única _páxina"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Todas as páxinas do _alimentador"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Deter o escaneado"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiples páxinas desde Flatbed"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografía"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Documento"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Esc_anear"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Deter o escaneado"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reordenar as páxinas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "Correo-_e"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Rotar á _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Rotar á _dereita"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ningún"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Rotar o recorte"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mover á esquerda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mover á dereita"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Axuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Contidos"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Iniciar un novo documento"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Novo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Escanear unha única páxina co escáner"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Gardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Deter o escaneo actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Deter"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Rotar á esquerda"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Xirar a páxina á dereita (sentido do reloxo)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Rotar á dereita"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recortar a páxina seleccionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recortar"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferencias"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Orixe de escaneo:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Resolución de _texto:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Resolución _fotográfica:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Cara a escanear:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Tamaño da páxina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brillo:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Calidade:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Escáner de documentos"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Buscando escáneres…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Escanear documentos"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Pechar"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "escanear;escáner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Requírese o nome de usuario e o contrasinal para acceder a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Listo para escanear"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Un xeito ben sinxelo de escanear documentos e imaxes. Pode recortar as "
-"partes malas dunha foto e rotala se está do revés. Pode imprimir os "
-"escaneos, exportalos a un PDF ou gardalos en varios formatos de imaxe."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Precísase software adicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Escáner Sinxelo usa o marco de traballo de SANE para ser compatíbel coa "
-"maioría de escáneres existentes."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Non foi posíbel conectar co escáner"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Non foi posíbel iniciar o escaneado"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-msgid "Error communicating with scanner"
-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.vala:391
-msgid "Failed to scan"
-msgstr "Produciuse un fallo ao escanear"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIVO...] - Utilidade de escaneado"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Ejecute «%s --help» para ver unha lista completa das opcións de liña de "
-"ordes dispoñíbeis."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Pechar"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Requírese o nome de usuario e o contrasinal para acceder a «%s»"
+"Precisa <a href=\"install-firmware\">instalar controladores</a> para o seu "
+"escáner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Non se detectou ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique que o seu escáner está conectado e aceso"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Precísase software adicional"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Precisa instalar controladores para o seu escáner."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Gardar como..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Gardar como…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Gardar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento de varias páxinas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (sen perdas)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (comprimido)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Formato do ficheiro:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compresión:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Xa existe un ficheiro co nome «%s». Desexa substituílo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Substituír"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Gardando"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Gardar o documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Contactando co escáner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Manter sen cambios"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Non é posíbel abrir o ficheiro de axuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -541,16 +558,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -561,204 +578,548 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Gardar o documento antes de saír?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Semella que ten un escáner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
 "href=\"http://support.brother.com\">Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Semella ter un escáner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
 "href=\"http://samsung.com/support\">Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Semella ter un escáner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Semella ter un escáner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Os controladores están dispoñíbeis no sitio web de <a "
-"href=\"http://support.epson.com\">Epson</a>."
+"Os controladores están dispoñíbeis no sitio web de <a href=\"http://support."
+"epson.com\">Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instalar controladores"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Unha vez instalados deberá reiniciar o Escáner Sinxelo."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Instalando os controladores..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Instalando os controladores…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Os controladores instaláronse correctamente."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 "Produciuse un fallo na instalación dos controladores (código do erro %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Produciuse un fallo na instalación dos controladores."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Necesita instalar o paquete(s) %s."
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Necesita instalar o paquete %s."
+msgstr[1] "Necesita instalar o paquete %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Atallos de teclado"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Axuda"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Sobre"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Saír"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Comezar de novo…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Xirar a páxina á dereita (sentido do reloxo)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Recortar a páxina seleccionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Eliminar a páxina seleccionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nome de _usuario para o recurso:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Contrasinal:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Non é posíbel codificar a páxina %i"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Escaneando"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Escanear unha única páxina"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Escanear todas as páxinas do alimentador de documentos"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Escanear continuamente desde o escáner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Deter o escaneado en progreso"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificación do documento"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Mover páxina á esquerda"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Mover páxina á dereita"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotar a páxina á esquerda (sentido contrario ao reloxo)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotar a páxina á dereita (sentido do reloxo)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Eliminar páxina"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Xestión de documentos"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Iniciar un novo documento"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gardar o documento escaneado"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Enviar por correo-e o documento analizado "
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimir o documento analizado"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copiar a páxina actual ao portapapeis"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Escáner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Escanear lados"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Tamaño da pantalla"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Anverso"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Atrás"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambos"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Atraso"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Varias páxinas do escáner"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segundos"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Escaneando"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "Resolución de _texto"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "Resolución _fotográfica"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Brillo"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Contraste"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Calidade"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automático"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Máis escuro"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Máis claro"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menos"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Máis"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Novo documento"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Non hai escáneres dispoñíbeis. Conecte un escáner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Documento"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Non foi posíbel conectar co escáner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Correo electrónico..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Non foi posíbel iniciar o escaneado"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimir..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Produciuse un erro na comunicación co escáner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Axuda"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostrar a versión de publicación"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Sobre"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostrar mensaxes de depuración"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Saír"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Cambiar o _escáner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Produciuse un fallo ao escanear"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instalar controladores"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Escaneo en progreso"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automático"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIVO...] — Utilidade de escaneado"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Máis escuro"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Ejecute «%s --help» para ver unha lista completa das opcións de liña de "
+"ordes dispoñíbeis."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Máis claro"
+#~ msgid "Front and Back"
+#~ msgstr "Anverso e reverso"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menos"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Máis"
+#~ msgid "Rotate Left"
+#~ msgstr "Rotar á esquerda"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínimo"
+#~ msgid "Rotate Right"
+#~ msgstr "Rotar á dereita"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Máximo"
+#~ msgid "Crop"
+#~ msgstr "Recortar"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Gardando o documento..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Orixe de escaneo:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Gardando páxina %d de %d"
+#~ msgid "New Document"
+#~ msgstr "Novo documento"
+
+#~ msgid "Document"
+#~ msgstr "Documento"
+
+#~ msgid "Email..."
+#~ msgstr "Correo electrónico..."
+
+#~ msgid "Print..."
+#~ msgstr "Imprimir..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instalar controladores"
+
+#~ msgid "Minimum"
+#~ msgstr "Mínimo"
+
+#~ msgid "Maximum"
+#~ msgstr "Máximo"
+
+#~ msgid "Saving document..."
+#~ msgstr "Gardando o documento..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Gardando páxina %d de %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -772,9 +1133,6 @@ msgstr "Gardando páxina %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Faltan ficheiros"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositivo desde o que escanear"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Dirección de escaneado"
 
@@ -782,30 +1140,26 @@ msgstr "Gardando páxina %d de %d"
 #~ msgstr "Altura da imaxe escaneada en píxeles"
 
 #~ 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'"
+#~ "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"
-#~ msgstr "Tipo de documento que está sendo escaneado"
+#~ "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."
+#~ "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."
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADEIRO se a xanela do aplicativo está maximizada"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositivo SANE desde o que adquirir as imaxes."
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Largura da imaxe escaneada"
 
@@ -815,7 +1169,6 @@ msgstr "Gardando páxina %d de %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Largura da xanela en píxeles"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -831,84 +1184,28 @@ msgstr "Gardando páxina %d de %d"
 #~ "  --help-all                      Mostra todas as opcións de axuda\n"
 #~ "  --help-gtk                      Mostra as opcións de GTK+"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolución para o escaneado de texto"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolución para o escaneado de fotos"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolución da última imaxe escaneada"
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Resolución en puntos por polgada da imaxe escaneada anteriormente."
 
-#~ 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."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Scanned Document"
-#~ msgstr "Documento escaneado"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Elixa o _tipo de ficheiro"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Directorio no que gardar os ficheiros"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Cara da páxina a escanear"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Altura do papel en décimas de mm"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "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»"
 
-#~ 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)."
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "A altura do papel en décimas de mm (ou 0 para a detección automática do "
-#~ "papel)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Largura do papel en décimas de mm"
-
-#~ msgid "The page side to scan."
-#~ msgstr "O lado da páxina a escanear."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Tipo de documento a escanear. Esta opción decide a resolución, cores e post-"
-#~ "procesado do escaneado"
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "A dirección do escáner sobre a páxina escaneada."
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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 tivo a última "
 #~ "páxina escaneada."
@@ -920,7 +1217,6 @@ msgstr "Gardando páxina %d de %d"
 #~ "A altura da imaxe escaneada. Este valor actualizase co que tivo a última "
 #~ "páxina escaneada."
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -940,22 +1236,5 @@ msgstr "Gardando páxina %d de %d"
 #~ "  --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"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Axuste de contraste de -100 a 100 (0 é ningún)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste do escaneo"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Axuste de brillo de -100 a 100 (0 é ningún)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Brillo do escaneo"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Valor de calidade a usar na compresión JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Valor de calidade a usar na compresión JPEG"
+#~ "  --g-fatal-warnings              Converter todos os avisos en erros "
+#~ "fatais"
diff --git a/po/he.gmo b/po/he.gmo
deleted file mode 100644
index af7109c..0000000
--- a/po/he.gmo
+++ /dev/null
diff --git a/po/he.po b/po/he.po
index 744a475..c1cb0f6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 09:01+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
+"PO-Revision-Date: 2017-03-29 06:28+0000\n"
+"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_אימות"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_שם המשתמש עבור המשאב:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_ססמה:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "גב וחזית"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "חזית"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "גב"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "סריקה פשוטה"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "מ_סמך"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "_סריקה"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "עמוד _בודד"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "כל הדפים מהמ_זין"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "ע_צירת הסריקה"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "טקסט"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "צילום"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "סידור הדפים מחדש"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_דוא״ל"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_עמוד"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "סיבוב _שמאלה"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "סיבוב _ימינה"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_חיתוך"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_ללא"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_מכתב"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "_פוליו"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "ה_תאמה אישית"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_סיבוב חיתוך"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
-msgstr ""
+msgstr "הזזה שמאלה"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
-msgstr ""
+msgstr "הזזה ימינה"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "ע_זרה"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_תוכן"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "התחלת מסמך חדש"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "חדש"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "סריקת עמוד בודד מהסורק"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "סריקה"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "שמירת המסמך לקובץ"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "שמירה"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "עצירת הסריקה הנוכחית"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "עצירה"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "סיבוב העמוד לשמאל (נגד כיוון השעון)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "סיבוב שמאלה"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "סיבוב העמוד לימין (עם כיוון השעון)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "סיבוב ימינה"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "חיתוך העמוד שנבחר"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "חיתוך"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "העדפות"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "_מקור הסריקה:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "ר_זולוציית הטקסט:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_רזולוציית התמונה:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "הצד הנסרק:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "מידות הדף:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "בהירות:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "ניגודיות:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "איכות:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "סורק מסמכים"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "סריקת מסמכים"
 
@@ -308,7 +322,7 @@ msgstr "סורק;סריקה;משטח;מזין דפים;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -319,198 +333,209 @@ msgstr ""
 "בתמונה ולהטות אם היא בכיוון הלא נכון. ניתן להדפיס את הסריקות שלך, לייצא אותן "
 "ל־PDF או לשמור אותן במגוון רחב של תסדירי תמונה."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "סריקה פשוטה משתמשת בסביבת העבודה SANE לטובת תמיכה ברוב הסורקים הזמינים."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "אין סורקים זמינים. נא לחבר סורק."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "לא ניתן להתחבר לסורק"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "לא ניתן להתחיל בסריקה"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "אירעה שגיאה בעת ההתקשרות עם הסורק"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: 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
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Print debugging messages"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "הסריקה נכשלה"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Run '%s --help' to see a full list of available command line options."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "ס_גירה"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "נדרשים שם משתמש וססמה כדי לגשת אל '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "לא נמצאו סורקים"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "יש לבדוק כי הסורק מחובר ומופעל"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr "נדרשות תכניות נוספות"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr "עליך להתקין את מנהל ההתקן של הסורק שלך."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_שמירה"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "מסמך סרוק.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "קובצי תמונה"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "כל הקבצים"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (מסמך מרובה עמודים)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (דחוס)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (ללא אבדן נתונים)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "תבנית הקובץ:"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "שמירת הקובץ נכשלה"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "האם לשמור את המסמך הנוכחי?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "התעלמות מהשינויים"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "לא ניתן לשמור את התמונה לתצוגה מקדימה"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של תמונות"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "שילוב צדדים"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "שילוב צדדים (הפוך)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "היפוך"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "להשאיר ללא שינוי"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -537,16 +562,16 @@ msgstr ""
 "ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "על אודות Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -559,22 +584,22 @@ msgstr ""
 "  Yaron https://launchpad.net/~sh-yaron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "האם לשמור את המסמך בטרם היציאה?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "לצאת ללא שמירה"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -583,12 +608,12 @@ msgstr ""
 "Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -597,17 +622,17 @@ msgstr ""
 "Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -616,138 +641,138 @@ msgstr ""
 "Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "התקנת מנהלי התקן"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "לאחר ההתקנה יהיה עליך להפעיל מחדש את סריקה פשוטה."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "מנהלי ההתקן מותקנים…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "מנהלי ההתקנים הותקנו בהצלחה!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "התקנת מנהלי ההתקנים נכשלה (קוד שגיאה %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr "התקנת מנהלי ההתקן נכשלה."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "יהיה עליך להתקין את החבילה/ות %s."
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (בררת מחדל)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "מסמך חדש"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "מסמך"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "דוא״ל…"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "הדפסה…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "עזרה"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "על אודות"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "יציאה"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "הת_קנת מנהלי התקן"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "כהה יותר"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "בהיר יותר"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "פחות"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "יותר"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "מזערי"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "מרבי"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "המסמך נשמר...‏"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "נשמר העמוד %d מתוך %d"
diff --git a/po/hr.gmo b/po/hr.gmo
deleted file mode 100644
index a66e2e3..0000000
--- a/po/hr.gmo
+++ /dev/null
diff --git a/po/hr.po b/po/hr.po
index 0bdcb7e..85b10bb 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,515 +6,523 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-11-26 12:08+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-18 22:23+0200\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-07-25 17:32+0000\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Ovlasti"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Uređaj za skeniranje"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Korisničko ime za izvor:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE uređaj iz kojeg se dobiva slika."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Lozinka:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Vrsta dokumenat koji se skenira"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Prednja i stražnja"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"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."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Prednja"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Širina papira u desetinkama milimetra"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Stražnja"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Visina papira u desetinkama milimetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"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/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Svjetlina skeniranja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Prilagodba svjetline od -100 do 100 (0 za nepromijenjeno)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast skeniranja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Prilagodba kontrasta od -100 do 100 (0 za nepromijenjeno)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Razlučivost skeniranja teksta"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Razlučivost u točkama po inču pri skeniranja teksta."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Razlučivost skeniranja fotografija"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Razlučivost u točkama po inču pri skeniranju slika."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Stranica lista za skeniranje"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Stranica lista za skeniranje."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Mapa za spremanje datoteka"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Mapa za spremanje datoteka. Ako nije postavljeno, koristi se mapa dokumenata."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Vrijednost kvalitetete pri JPEG sažimanju"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Vrijednost kvalitetete pri JPEG sažimanju."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Odgoda u milisekundama između stranica"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Odgoda u milisekundama između stranica."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Skeniranje dokumenata"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenirajte dokumente"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_eniraj"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Istinski jednostavan način skeniranja dokumenata i fotografija. Možete "
+"izrezati loše dijelove fotografija i zakrenuti ih ako su pogrešno okrenute. "
+"Možete ispisati vaše skenirane dokumente ili fotografije, izvesti ih u pdf "
+"ili ih spremiti u različite slikovne formate."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Skeniranje dokumenata koristi SANE radni okvir za podršku većine postojećih "
+"skenera."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skener dokumenta"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skeniraj;skener;plosnat;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Jednu _stranicu"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Sve stranice iz _uvlakača"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Zaustavi skeniranje"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Višestruke stranice iz plošnog skenera"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografija"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_eniraj"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zaustavi skeniranje"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Presloži stranice"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-pošta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Stranica"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Zakreni _lijevo"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Zakreni _desno"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Izreži"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ništa"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Pr_avno"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Prilagođeno"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Zakreni isječak"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Pomakni ulijevo"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Pomakni udesno"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Priručnik"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Priručnik"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Započni novi dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Novo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Skeniraj jednu stranicu sa skenera"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skeniraj"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Spremi"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno skeniranje"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zaustavi"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Zakreni stranicu ulijevo (obrnuto od kazaljke na satu)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Zakreni lijevo"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Zakreni stranicu udesno (u smjeru kazaljke na satu)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Zakreni udesno"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Izreži odabranu stranicu"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Izreži"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Osobitosti"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Izvor skeniranja:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Razlučivost teksta:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Razlučivost slike:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Stranica skeniranja:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Pretraživanje skenera. . ."
 
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Veličina stranice:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Svjetlina:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvaliteta:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Skener dokumenta"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skenirajte dokumente"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Zatvori"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skeniraj;skener;plosnat;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Korisničko ime i lozinka su potrebni za pristup “%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "skener"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Spreman za skeniranje"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Istinski jednostavan način skeniranja dokumenata i fotografija. Možete "
-"izrezati loše dijelove fotografija i zakrenuti ih ako su pogrešno okrenute. "
-"Možete ispisati vaše skenirane dokumente ili fotografije, izvesti ih u pdf "
-"ili ih spremiti u različite slikovne formate."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Potreban je dodatan softver"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Skeniranje dokumenata koristi SANE radni okvir za podršku većine postojećih "
-"skenera."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Nema dostupnih skenera. Molim spojite skener."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Nemoguće povezivanje sa skenerom"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Nemoguće pokretanje skenera"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-msgid "Error communicating with scanner"
-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 otklanjanja grešaka"
-
-#: ../src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
-"Popravi PDF datoteke generirane starijom inačicom Skeniranja dokumenata"
-
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "Neuspjelo skeniranje"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[UREĐAJ...] - Alat za skeniranje"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Pokrenite '%s --help'  kako biste vidjeli potpuni popis dostupnih mogućnosti "
-"naredbenog retka."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Zatvori"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Korisničko ime i lozinka su potrebni za pristup '%s'"
+"Morate <a href=\"install-firmware\">instalirati upravljački program</a> za "
+"vaš skener."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nema otkrivenih skenera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Provjerite je li vaš skener spojen i uključen"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Potreban je dodatan softver"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Morate instalirati upravljački program za vaš skener."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Spremi kao..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Spremi kao…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Spremi"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Skenirani dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Sve datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument od više stranica)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (sažeto)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (bez gubitaka)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (sažeto)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format datoteke:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Sažimanje:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Datoteka naziva “%s” već postoji.  Želite li ju zamijeniti?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Zamijeni"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Spremanje"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Neuspjelo spremanje datoteke"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
 msgstr "Ako ne spremite, promjene će biti trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Spremi trenutni dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Odbaci promjene"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktiranje skenera. . ."
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Neuspjelo spremanje slike za pregled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Nemoguće otvaranje aplikacije pregleda slike"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombiniraj strane"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombiniraj strane (obrnuto)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Obrnuto"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Zadrži nepromijenjeno"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Nemoguće otvaranje datoteke pomoći"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -543,16 +551,16 @@ msgstr ""
 "program. Ako niste, posjetite <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "O skeniranju dokumenata"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Alat za jednostavno skeniranje"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -562,401 +570,543 @@ msgstr ""
 "  Saša Teković https://launchpad.net/~hseagle2015\n"
 "  Tina Kružić https://launchpad.net/~tina-kruzic\n"
 "  gogo https://launchpad.net/~trebelnik-stefina\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.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Spremi dokument prije zatvaranja?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Zatvori bez spremanja"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Izgleda kako imate Brother skener."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Upravljački programi su dostupni na <a "
-"href=\"http://support.brother.com\">Brother web stranici</a>."
+"Upravljački programi su dostupni na <a href=\"http://support.brother.com"
+"\">Brother web stranici</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Izgleda kako imate Samsung skener."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Upravljački programi su dostupni na <a "
-"href=\"http://samsung.com/support\">Samsung web stranici</a>."
+"Upravljački programi su dostupni na <a href=\"http://samsung.com/support"
+"\">Samsung web stranici</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Izgleda kako imate HP skener."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Izgleda kako imate Epson skener."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Upravljački programi za ovaj pisač su dostupi na <a "
-"href=\"http://support.epson.com\">Epson web stranici</a>."
+"Upravljački programi za ovaj pisač su dostupi na <a href=\"http://support."
+"epson.com\">Epson web stranici</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instaliraj upravljački program"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Jednom kada se instalira, morate ponovno pokrenuti Skeniranje dokumenata."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Instalacija upravljačkih programa..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Upravljački programi su uspješno instalirani!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Neuspjela instalacija upravljačkih programa (kôd greške %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Neuspjela instalacija upravljačkih programa."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Morate instalirati %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Morate instalirati %s paket."
+msgstr[1] "Morate instalirati %s paketa."
+msgstr[2] "Morate instalirati %s paketa."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Osobitosti"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (zadano)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Prečaci tipkovnice"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (skica)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Priručnik"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (visoka razlučivost)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programu"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Zatvori"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-pošta"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Ponovno pokreni..."
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Zakreni stranicu ulijevo (obrnuto od kazaljke na satu)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Zakreni stranicu udesno (u smjeru kazaljke na satu)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Izreži odabranu stranicu"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Obriši odabranu stranicu"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Odustani"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Ovlasti"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Korisničko ime za izvor:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+msgid "Unable to encode page %i"
+msgstr "Nemoguće dekôdiranje stranice %i"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Novi dokument"
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skeniraj"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skeniraj jednu stranicu"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-pošta..."
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skeniraj jednu stranicu sa uvlakača dokumenta"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Ispiši…"
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skeniraj jednu stranicu sa plošnog skenera"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Priručnik"
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zaustavi trenutno skeniranje"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "O programu"
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Promjena dokumenta"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Zatvori"
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pomakni stranicu ulijevo"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pomakni stranicu udesno"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Zakreni stranicu ulijevo (obrnuto od kazaljke na satu)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Zakreni stranicu udesno (u smjeru kazaljke na satu)"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Promijeni _skener"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Obriši stranicu"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instaliraj upravljačke programe"
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Upravljanje dokumentima"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Započni novi dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Spremi trenutni dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-pošta skenira dokument"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Ispiši skenirani dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiraj trenutnu stranicu u međuspremnik"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skener"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Stranica skeniranja"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Veličina stranice"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Prednja"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Stražnja"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obje"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Odgoda"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Višestruke stranice iz plošnog skenera"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekune"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skeniranje"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Razlučivost teksta"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Razlučivost slike"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Svjetlina"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvaliteta"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatska"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Tamnije"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Svjetlije"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Manje"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Više"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Najmanje"
-
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Najviše"
-
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Spremanje dokumenta..."
-
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Spremanje stranice %d od %d"
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+msgid "%d dpi (default)"
+msgstr "%d dpi (zadano)"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Uređaj za skeniranje"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (skica)"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Smjer skeniranja"
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (visoka razlučivost)"
 
-#~ 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 \""
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Visina skenirane slike u pikselima"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nema dostupnih skenera. Molim spojite skener."
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "ISTINA ako je prozor aplikacije maksimalan"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nemoguće povezivanje sa skenerom"
 
-#~ 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."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nemoguće pokretanje skenera"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE uređaj iz kojeg se dobiva slika."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Greška pri komunikaciji sa skenerom"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Rezolucija zadnje skenirane slike"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Prikaži inačicu izdanja"
 
-#~ msgid ""
-#~ "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)."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Ispiši poruke otklanjanja grešaka"
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Širina papira u desetinkama milimetra"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Popravi PDF datoteke generirane starijom inačicom Skeniranja dokumenata"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Visina papira u desetinkama milimetra"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Neuspjelo skeniranje"
 
-#~ msgid ""
-#~ "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)."
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Skeniranje je u tijeku"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Vrsta dokumenat koji se skenira"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[UREĐAJ…] — Pomagalo skeniranja"
 
-#~ 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."
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Pokreni “%s --help” kako biste vidjeli potpuni popis mogućnosti naredbenog "
+"redka."
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Rezolucija u točkama po inču prethodno skenirane slike."
+#~ msgid "Saving document…"
+#~ msgstr "Spremanje dokumenta..."
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Širina skenirane slike u pikselima"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Spremanje stranice %d od %d"
 
-#~ msgid ""
-#~ "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."
+#~ msgid "Save As..."
+#~ msgstr "Spremi kao..."
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Širina prozora u pikselima"
+#~ msgid "Crop"
+#~ msgstr "Izreži"
 
-#, 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"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Visina prozora u pikselima"
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Izvor skeniranja:"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Upotreba:\n"
-#~ "  %s [UREĐAJ...] - Korist skeniranja"
+#~ msgid "Username and password required to access '%s'"
+#~ msgstr "Korisničko ime i lozinka su potrebni za pristup '%s'"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skenirani dokument"
+#~ msgid "If you don't save, changes will be permanently lost."
+#~ msgstr "Ako ne spremite, promjene će biti trajno izgubljene."
 
-#, 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 "[DEVICE...] - Scanning utility"
+#~ msgstr "[UREĐAJ...] - Alat za skeniranje"
 
-#~ msgid "Files missing"
-#~ msgstr "Nedostaju datoteke"
+#~ msgid "Rotate Right"
+#~ msgstr "Zakreni udesno"
 
-#~ 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'"
+#~ msgid "Rotate Left"
+#~ msgstr "Zakreni lijevo"
 
 #~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
+#~ "Run '%s --help' to see a full list of available command line options."
 #~ msgstr ""
-#~ "Vrsta dokumenta koji se skenira. Ova postavka određuje razlučivost, boju i "
-#~ "naknadnu obradu."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Smjer skenera preko skenirane stranice."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Prilagodba kontrasta od -100 do 100 (0 za nepromijenjeno)."
+#~ "Pokrenite '%s --help'  kako biste vidjeli potpuni popis dostupnih "
+#~ "mogućnosti naredbenog retka."
 
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast skeniranja"
+#~ msgid "Change _Scanner"
+#~ msgstr "Promijeni _skener"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Prilagodba svjetline od -100 do 100 (0 za nepromijenjeno)."
+#~ msgid "Minimum"
+#~ msgstr "Najmanje"
 
-#~ msgid "Brightness of scan"
-#~ msgstr "Svjetlina skeniranja"
+#~ msgid "Maximum"
+#~ msgstr "Najviše"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Razlučivost skeniranja teksta"
+#~ msgid "Saving document..."
+#~ msgstr "Spremanje dokumenta..."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Razlučivost u točkama po inču pri skeniranja teksta."
+#~ msgid "Front and Back"
+#~ msgstr "Prednja i stražnja"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Stranica lista za skeniranje."
+#~ msgid "Email..."
+#~ msgstr "E-pošta..."
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Vrijednost kvalitetete pri JPEG sažimanju."
+#~ msgid "Document"
+#~ msgstr "Dokument"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Stranica lista za skeniranje"
+#~ msgid "New Document"
+#~ msgstr "Novi dokument"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Vrijednost kvalitetete pri JPEG sažimanju"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Razlučivost skeniranja fotografija"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Razlučivost u točkama po inču pri skeniranju slika."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Direktorij za spremanje datoteka. Ako nije postavljeno, koristi se "
-#~ "direktorij dokumenata."
+#~ msgid "Print..."
+#~ msgstr "Ispiši…"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Direktorij za spremanje datoteka"
+#~ msgid "You need to install driver software for your scanner."
+#~ msgstr "Morate instalirati upravljački program za vaš skener."
 
-#~ msgid "Select File _Type"
-#~ msgstr "Odaberi _vrstu datoteke"
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instaliraj upravljačke programe"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Provjerite vašu instalaciju"
+#~ msgid "Installing drivers..."
+#~ msgstr "Instalacija upravljačkih programa..."
diff --git a/po/hu.gmo b/po/hu.gmo
deleted file mode 100644
index d26b8d3..0000000
--- a/po/hu.gmo
+++ /dev/null
diff --git a/po/hu.po b/po/hu.po
index a271ec0..2a80984 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,518 +1,526 @@
 # Hungarian 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.
 #
+# Gabor Kelemen <kelemeng at ubuntu dot com>, 2017.
+# Balázs Úr <urbalazs at gmail dot com>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2014-02-18 14:14+0000\n"
-"Last-Translator: Gabor Kelemen <kelemeng@openscope.org>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-09-05 17:53+0200\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Felhatalmazás"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "A szkennelő eszköz"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Felhasználónév az erőforráshoz:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Képek beszerzése erről a SANE eszközről."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Jelszó:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "A szkennelt dokumentum típusa"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"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."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Előlap és hátlap"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Papír szélessége tizedmilliméterben"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Előlap"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Hátlap"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papír magassága tizedmilliméterben"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+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/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "A beolvasás fényereje"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "A fényerő változtatása -100-tól 100-ig (0=nincs)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "A beolvasás kontrasztja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "A kontraszt változtatása -100-tól 100-ig (0=nincs)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Szövegek szkennelésének felbontása"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Szövegek szkennelésnél használandó  DPI felbontás."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Fotók szkennelésének felbontása"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Lapok szkennelendő oldala"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "A lap szkennelendő oldala."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Fájlok mentése ebbe a könyvtárba"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "A minőségi tényező megadása a JPEG tömörítéshez"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "A minőségi tényező megadása a JPEG tömörítéshez."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "A lapok közti késleltetés ezredmásodpercben"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "A lapok közti késleltetés ezredmásodpercben."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "Simple Scan"
+msgstr "Szkenner"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokumentum"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Dokumentumok szkennelése"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sz_kennelés"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Igazán egyszerű megoldás dokumentumok és fényképek szkennelésére. Levághatja "
+"a képek fölösleges részeit, és elforgathatja azokat. Kinyomtathatja, PDF-be "
+"vagy számos képformátumba is exportálhatja a szkennelt dokumentumokat."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"A Szkenner a SANE keretrendszert használja a legtöbb létező szkenner "
+"támogatása érdekében."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentumbeolvasó"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "szkennelés;szkenner;beolvasó;síkágyas;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Egy _oldal"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Minden oldal az _adagolóból"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Szkennelés megállítása"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Több lap a síkágyról"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Szöveg"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fénykép"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokumentum"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sz_kennelés"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Szkennelés megállítása"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Oldalak újrarendezése"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Oldal"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Forgatás b_alra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Forgatás _jobbra"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Vágás"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nincs vágás"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Egyéni"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Vágott rész fo_rgatása"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mozgatás balra"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mozgatás jobbra"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Súgó"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Tartalom"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Új dokumentum létrehozása"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Új"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Szkennelés"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Mentés"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "A jelenlegi szkennelés leállítása"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Leállít"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Az oldal elforgatása balra (az óra járásával ellentétesen)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Forgatás balra"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Az oldal elforgatása jobbra (az óra járásával egyezően)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Forgatás jobbra"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "A kiválasztott oldal vágása"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Vágás"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Beállítások"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Szkennelés _forrása:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Szkennerek keresése…"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Szöveg felbontása:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotó felbontása:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Oldal szkennelése:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Oldalméret:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Fényerő:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontraszt:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Minőség:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentumbeolvasó"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Dokumentumok szkennelése"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Bezárás"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "szkennelés;szkenner;beolvasó;síkágyas;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, 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"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Szkennelésre kész"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Igazán egyszerű megoldás dokumentumok és fényképek szkennelésére. Levághatja "
-"a képek fölösleges részeit, és elforgathatja azokat. Kinyomtathatja, PDF-be "
-"vagy számos képformátumba is exportálhatja a szkennelt dokumentumokat."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "További szoftverek szükségesek"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"A Simple Scan a SANE keretrendszert használja a legtöbb létező szkenner "
-"támogatása érdekében."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Nem található szkenner. Csatlakoztasson egyet."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Nem sikerült csatlakozni a szkennerhez"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Nem sikerült elindítani a szkennelést"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "A szkennelés meghiúsult"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Futtassa a(z) „%s --help” parancsot a parancssori kapcsolók listájáért."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Bezárás"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, 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"
+"A szkennerhez <a href=\"install-firmware\">illesztőprogramot kell "
+"telepíteni</a>."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
-msgstr ""
-"Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
-
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "További szoftverek szükségesek"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "A szkennerhez illesztőprogramot kell telepíteni."
+msgstr "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Mentés másként…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Mentés"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Képfájlok"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Minden fájl"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (többoldalas dokumentum)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (tömörített)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (veszteségmentes)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (tömörített)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Fájlformátum:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Tömörítés:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Már létezik „%s” nevű fájl. Le akarja cserélni?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Csere"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Mentés"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Mentse az aktuális dokumentumot?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kapcsolatfelvétel a szkennerrel…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Oldalak egyesítése"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Oldalak egyesítése (fordított)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Fordított"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Maradjon változatlan"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "A súgófájl nem nyitható meg"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -540,18 +548,20 @@ msgstr ""
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Simple Scan névjegye"
+msgstr "Szkenner névjegye"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Meskó Balázs <meskobalazs at fedoraproject dot org>\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Gabor Kelemen https://launchpad.net/~kelemeng\n"
 "  Muszela Balázs https://launchpad.net/~bazsi86-deactivatedaccount\n"
@@ -566,400 +576,463 @@ msgstr ""
 "  Úr Balázs https://launchpad.net/~urbalazs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Kilépés mentés nélkül"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Úgy tűnik, Brother márkájú szkennere van."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Ehhez a <a href=\"http://support.brother.com\">Brother weboldaláról</a> "
 "érhetők el illesztőprogramok."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Úgy tűnik, Samsung márkájú szkennere van."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Ehhez a <a href=\"http://samsung.com/support\">Samsung weboldaláról</a> "
 "érhetők el illesztőprogramok."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Úgy tűnik, HP márkájú szkennere van."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Úgy tűnik, Epson márkájú szkennere van."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Ehhez az <a href=\"http://support.epson.com\">Epson weboldaláról</a> érhetők "
 "el illesztőprogramok."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Illesztőprogramok telepítése"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "A telepítés után újra kell indítania a Simple Scant."
+msgstr "A telepítés után újra kell indítania a Szkennert."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Illesztőprogramok telepítése…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr "Az illesztőprogramok sikeresen telepítve"
+msgstr "Az illesztőprogramok sikeresen telepítve!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Az illesztőprogramok telepítése meghiúsult (hibakód: %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Az illesztőprogramok telepítése meghiúsult."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Telepíteni kell a következő csomagokat: %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Telepíteni kell a következő csomagot: %s."
+msgstr[1] "Telepíteni kell a következő csomagokat: %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Beállítások"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (alapértelmezett)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Gyorsbillentyűk"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (vázlat)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Súgó"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (nagy felbontás)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Névjegy"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Kilépés"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Küldés e-mailben"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Újrakezdés…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Az oldal elforgatása balra (az óra járásával ellentétesen)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Az oldal elforgatása jobbra (az óra járásával egyezően)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "A kiválasztott oldal vágása"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "A kiválasztott oldal törlése"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Mégse"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Felhatalmazás"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Felhasználónév az erőforráshoz:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Jelszó:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+msgid "Unable to encode page %i"
+msgstr "A(z) %i. lap nem kódolható"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Új dokumentum"
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Szkennelés"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokumentum"
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Egy oldal szkennelése"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Minden oldal szkennelése az adagolóból"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Folyamatos szkennelés síkágyas szkennerről"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Folyamatban lévő szkennelés leállítása"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentum módosítás"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Lap mozgatása balra"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Lap mozgatása jobbra"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Az oldal elforgatása balra (az óra járásával ellentétesen)"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail…"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Az oldal elforgatása jobbra (az óra járásával egyezően)"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Nyomtatás…"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Lap törlése"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Súgó"
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumentumkezelés"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Névjegy"
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Új dokumentum létrehozása"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Kilépés"
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Beszkennelt dokumentum mentése"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Beszkennelt dokumentum küldése e-mailben"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Beszkennelt dokumentum nyomtatása"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "_Szkennerváltás"
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Jelenlegi lap másolása a vágólapra"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Illesztőprogramok telepítése"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "Szk_enner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Szélek szkennelése"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Oldalméret"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Előlap"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Hátlap"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Mindkettő"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Késleltetés"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "Multiple page from flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Több lap a síkágyról"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "másodperc"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Szkennelés"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Szöveg _felbontása"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Fotó felbontása"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Fényerő"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontraszt"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Minőség"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Sötétebb"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Világosabb"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Kevesebb"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Több"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (alapértelmezett)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (vázlat)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Dokumentum mentése..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (nagy felbontás)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "%d. oldal mentése, összesen %d"
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nem található szkenner. Csatlakoztasson egyet."
 
-#~ msgid "Files missing"
-#~ msgstr "Hiányzó fájl"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nem sikerült csatlakozni a szkennerhez"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Használat:\n"
-#~ "  %s [ESZKÖZ...] - Szkennelő segédprogram"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nem sikerült elindítani a szkennelést"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Ellenőrizze a telepítést"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Kommunikációs hiba a szkennerrel"
 
-#, 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 "Device to scan from"
-#~ msgstr "A szkennelő eszkőz"
-
-#~ msgid "Direction of scan"
-#~ msgstr "A szkennelés íránya"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "A szkennelt dokumentum típusa"
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "Igaz, ha az alkalmazás teljes képernyős módban van"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Képek beszerzése erről a SANE eszközről"
-
-#~ 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."
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Ablak magassága képpontban"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Ablak szélessége képpontban"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Verziószám megjelenítése"
 
-#, 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 "Height of scanned image in pixels"
-#~ msgstr "A szkennelt kép magassága képpontban"
-
-#~ 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."
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "A szkennelt kép magassága képpontban. Mindig a legutolsó szkennelés "
-#~ "eredményét veszi fel."
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "A szkennelt kép szélessége képpontban"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Szövegek szkennelésének felbontása"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Fotók szkennelésének felbontása"
-
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Az utoljára beszkennelt kép DPI felbontása."
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Az utoljára beszkennelt kép felbontása"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Beszkennelt dokumentum"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Válasszon fájl_típust"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Szövegek szkennelésnél használandó  DPI felbontás."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Fotók szkennelésnél használandó  DPI felbontás."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Fájlok mentése ebbe a könyvtárba"
-
-#~ 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."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Papír magassága tizedmilliméterben"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Papír szélessége tizedmilliméterben"
-
-#~ 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)"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Lapok szkennelendő oldala"
-
-#~ 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)."
-
-#~ 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)."
-
-#~ msgid "The page side to scan."
-#~ msgstr "A lap szkennelendő oldala."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "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."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "A szkennelés iránya a szkennelt lap fölött."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Hibakeresési üzenetek kiírása"
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "A minőségi tényező megadása a JPEG tömörítéshez."
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "A Szkenner régebbi verzióival készült PDF fájlok javítása"
 
-#~ msgid "Contrast of scan"
-#~ msgstr "A beolvasás kontrasztja"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "A szkennelés meghiúsult"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "A minőségi tényező megadása a JPEG tömörítéshez"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Szkennelés folyamatban"
 
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "A kontraszt változtatása -100-tól 100-ig (0=nincs)."
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "A fényerő változtatása -100-tól 100-ig (0=nincs)."
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Futtassa a(z) „%s --help” parancsot a parancssori kapcsolók listájáért."
 
-#~ msgid "Brightness of scan"
-#~ msgstr "A beolvasás fényereje"
diff --git a/po/hy.gmo b/po/hy.gmo
deleted file mode 100644
index 0f66606..0000000
--- a/po/hy.gmo
+++ /dev/null
diff --git a/po/hy.po b/po/hy.po
index 47e1b66..9e28bce 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: hy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Ետ"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr ""
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr ""
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/id.gmo b/po/id.gmo
deleted file mode 100644
index 5146765..0000000
--- a/po/id.gmo
+++ /dev/null
diff --git a/po/id.po b/po/id.po
index b2775c1..216b76c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,517 +1,526 @@
 # Indonesian translation for simple-scan
 # 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.
+# Andika Triwidada <andika@gmail.com>, 2017
+# Kukuh Syafaat <syafaatkukuh@gmail.com>, 2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2014-01-18 00:43+0000\n"
-"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
+"Project-Id-Version: simple-scan master\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-09 15:17+0700\n"
+"Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Otoris_asikan"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Perangkat untuk memindai"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nama pengg_una untuk sumber daya:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Perangkat SANE yang dipakai untuk mengambil gambar."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Sandi:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipe dokumen yang akan dipindai"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipe dokumen yang akan dipindai. Pengaturan ini menentukan resolusi, warna, "
+"dan pasca-proses pemindaian."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Depan dan Belakang"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Lebar kertas dalam persepuluhan milimeter"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Depan"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Lebar kertas dalam persepuluhan mm (atau 0 untuk deteksi kertas otomatis)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Belakang"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Panjang kertas dalam persepuluh mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Panjang kertas dalam sepersepuluh mm (atau 0 jika kertas dideteksi otomatis)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Kecerahan pemindaian"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Penyesuaian kecerahan dari -100 ke 100 (0 berarti nihil)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontras pemindaian"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Penyesuaian kontras dari -100 ke 100 (0 berarti nihil)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolusi untuk pemindaian teks"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian teks."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolusi untuk pemindaian foto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian foto."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Sisi halaman yang dipindai"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Sisi halaman yang dipindai."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Simpan berkas ke direktori"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Direktori tempat menyimpan berkas. Akan disimpan ke direktori dokumen jika "
+"belum diset."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Tundaan dalam mili detik antar halaman"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Tundaan dalam mili detik antar halaman."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Pemindai Ringkas"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokumen"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Pindai Dokumen"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Pind_ai"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Cara mudah untuk memindai dokumen dan foto. Anda dapat membuang bagian yang "
+"jelek dari suatu foto dan memutarnya bila itu terbalik. Anda dapat mencetak "
+"pindaian Anda, mengekspor ke pdf, atau menyimpan ke sejumlah format berkas."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan memakai framework SANE untuk mendukung kebanyakan pemindai yang "
+"ada."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Pelarik Dokumen"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;pelarik;pemindai;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Satu _Halaman"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Semua Halaman Dari _Feeder"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Berhenti _Memindai"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Beberapa Hala_man Dari Flatbed"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Teks"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokumen"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Pind_ai"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Berhenti _Memindai"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Atur Ulang Halaman"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "Sur_el"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
-msgstr ""
+msgstr "Putar _Kiri"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
-msgstr ""
+msgstr "Putar Ka_nan"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
-msgstr ""
+msgstr "_Potong"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nihil"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4x6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Ubahan"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Puta_r dan Potong"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Pindah Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Pindah Ke Kanan"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
-msgstr ""
+msgstr "Ba_ntuan"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Isi"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr ""
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr ""
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr ""
+msgstr "Pindai sebuah halaman dari pemindai"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Pindai"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr ""
+msgstr "Simpan hasil dalam berkas"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
-msgstr ""
+msgstr "Simpan"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Hentikan pemindaian"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
-msgstr ""
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr ""
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Putar halaman ke kanan (searah jarum jam)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr ""
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr ""
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr ""
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferensi"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Sumber Pindai:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Resolusi _Teks:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Resolusi _Foto:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr ""
+msgstr "Stop"
 
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr ""
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Kecerahan:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontras:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kualitas:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Pelarik Dokumen"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Mencari Pemindai…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Pindai Dokumen"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Tutup"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;pelarik;pemindai;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Nama pengguna dan kata sandi dibutuhkan untuk mengakses \"%s\""
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Siap Memindai"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Cara mudah untuk memindai dokumen dan foto. Anda dapat membuang bagian yang "
-"jelek dari suatu foto dan memutarnya bila itu terbalik. Anda dapat mencetak "
-"pindaian Anda, mengekspor ke pdf, atau menyimpan ke sejumlah format berkas."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Perlu perangkat lunak tambahan"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Simple Scan memakai framework SANE untuk mendukung kebanyakan pemindai yang "
-"ada."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Tidak ada pemindai yang tersedia. Mohon hubungkan pemindai."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Tak dapat terhubung ke pemindai"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Tak dapat memulai pemindaian"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-msgid "Error communicating with scanner"
-msgstr "Galat saat berhubungan dengan pemindai"
-
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "Tampilkan versi rilis"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Cetak pesan pengawakutuan"
-
-#: ../src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr "Perbaiki berkas PDF yang dibuat dengan Simple Scan versi lawas"
-
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "Gagal memindai"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[PERANGKAT...] - Utilitas pemindaian"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Tutup"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Nama pengguna dan kata sandi dibutuhkan untuk mengakses '%s'"
+"Anda perlu <a href=\"install-firmware\">memasang perangkat lunak penggerak</"
+"a> bagi pemindai Anda."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Tidak ada pemindai yang terdeteksi"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
-msgstr ""
-"Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
-
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Perlu perangkat lunak tambahan"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Anda perlu memasang perangkat lunak penggerak bagi pemindai Anda."
+msgstr "Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Simpan"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Hasil Pindai.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Berkas Citra"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Semua Berkas"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen multi-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (terkompresi)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (terkompresi)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format berkas:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Kompresi:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Berkas dengan nama \"%s\" sudah ada. Apakah Anda ingin menimpanya?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Timpa"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Menyimpan"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Gagal menyimpan berkas"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
 msgstr "Jika Anda tidak menyimpan, perubahan akan hilang secara permanen."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Simpan dokumen saat ini?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Buang Perubahan"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Menghubungi pemindai…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Tak dapat menyimpan gambar untuk pratinjau"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Tidak dapat membuka aplikasi pratinjau gambar"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinasikan sisi-sisi"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinasikan sisi-sisi (balik)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Balikkan"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Biarkan tak berubah"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Tak dapat membuka berkas bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -539,18 +548,20 @@ msgstr ""
 "bersama program ini. Bila tidak, lihat <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Tentang Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Alat pemindai dokumen sederhana"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Kukuh Syafaat <syafaatkukuh@gmail.com>, 2017.\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Abdul Munif Hanafi https://launchpad.net/~nafica-coroz\n"
 "  Andika Triwidada https://launchpad.net/~andika\n"
@@ -567,327 +578,460 @@ msgstr ""
 "  jemmy surya https://launchpad.net/~jemmy"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Keluar tanpa menyimpan"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Nampaknya Anda punya pemindai Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Penggerak bagi ini tersedia di <a href=\"http://support.brother.com\">situs "
 "web Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Nampaknya Anda punya pemindai Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Penggerak bagi ini tersedia di <a href=\"http://samsung.com/support\">situs "
 "web Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Nampaknya Anda punya pemindai HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Nampaknya Anda punya pemindai Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Penggerak bagi ini tersedia di <a href=\"http://support.epson.com\">situs "
 "web Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Pasang penggerak"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Sekali terpasang Anda perlu memulai ulang Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Memasang penggerak..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Memasang penggerak…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Penggerak sukses terpasang!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Gagal memasang penggerak (kode kesalahan %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Gagal memasang penggerak."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
-#, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Anda perlu memasang paket %s."
-
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (default)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/app-window.vala:1454
 #, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (draft)"
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Anda perlu memasang paket %s."
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (resolusi tinggi)"
-
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Dokumen Baru"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokumen"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Surel..."
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferensi"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Cetak..."
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Pintasan Papan Tik"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
 msgstr "Keluar"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Ganti _Pemindai"
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Surel"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Pasang Penggerak"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Mulai lagi…"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Otomatis"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Lebih Gelap"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Putar halaman ke kanan (searah jarum jam)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Lebih Terang"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Potong halaman yang dipilih"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Kurang"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Hapus halaman yang dipilih"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Lebih"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Batal"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Otoris_asikan"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksimum"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nama pengg_una untuk sumber daya:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Menyimpan dokumen..."
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Sandi:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Menyimpan halaman %d dari %d"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolusi untuk pemindaian foto"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolusi untuk pemindaian teks"
-
-#~ msgid "Files missing"
-#~ msgstr "Berkas hilang"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Sisi halaman yang dipindai"
+msgid "Unable to encode page %i"
+msgstr "Tak dapat mengkodekan halaman %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Memindai"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Pindai sebuah halaman"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Pindai semua halaman dari pengumpan dokumen"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Scan terus menerus dari pemindai flatbed"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Hentikan pemindaian yang sedang berlangsung"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modifikasi Dokumen"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pindahkan halaman ke kiri"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pindahkan halaman ke kanan"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Panjang kertas dalam persepuluh mm"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Putar halaman ke kanan (searah jarum jam)"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Resolusi pemindaian terakhir"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Hapus halaman"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Pengelolaan Dokumen"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Mulai dokumen baru"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Simpan dokumen yang dipindai"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Kirim surel dokumen pindaian"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Cetak dokumen pindaian"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Salin halaman ini ke papan klip"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Simpan berkas ke direktori"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Pemindai"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Arah pemindaian"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Bidang Pindai:"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Sisi halaman yang dipindai."
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Ukuran Halaman"
 
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Arah pemindaian terhadap halaman yang dipindai."
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Depan"
 
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Panjang kertas dalam sepersepuluh mm (atau 0 jika kertas dideteksi otomatis)"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Belakang"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "TRUE jika jendela aplikasi dimaksimalkan"
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Keduanya"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Tunda"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Beberapa halaman dari flatbed"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Detik"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Memindai"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Resolusi dalam dots-per-inch dari gambar sebelumnya."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Resolusi _Teks"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Direktori tempat menyimpan berkas. Akan disimpan ke direktori dokumen jika "
-#~ "belum diset."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Resolusi _Foto"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipe dokumen yang akan dipindai"
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Kecerahan"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Tinggi jendela dalam piksel"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontras"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Lebar jendela dalam piksel"
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kualitas"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Perangkat untuk memindai"
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Otomatis"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Tinggi gambar terpindai dalam piksel"
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Lebih Gelap"
 
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Lebar gambar terpindai dalam piksel. Nilai ini diupdate sesuai halaman "
-#~ "terakhir yang pernah dipindai."
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lebih Terang"
 
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Tinggi gambar terpindai dalam piksel. Nilai ini diupdate sesuai halaman "
-#~ "terakhir yang pernah dipindai."
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Kurang"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Lebar gambar terpindai dalam piksel"
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Lebih"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian teks."
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (default)"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Dokumen Terpindai"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (draft)"
 
-#~ msgid "Select File _Type"
-#~ msgstr "Pilih _Tipe Berkas"
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (resolusi tinggi)"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Tipe dokumen yang akan dipindai. Pengaturan ini menentukan resolusi, warna, "
-#~ "dan pasca-proses pemindaian."
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Perangkat SANE yang dipakai untuk mengambil gambar."
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Tidak ada pemindai yang tersedia. Mohon hubungkan pemindai."
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Lebar kertas dalam persepuluhan milimeter"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Tak dapat terhubung ke pemindai"
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Lebar kertas dalam persepuluhan mm (atau 0 untuk deteksi kertas otomatis)."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Tak dapat memulai pemindaian"
 
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Penyesuaian kontras dari -100 ke 100 (0 berarti nihil)."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Galat saat berhubungan dengan pemindai"
 
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontras pemindaian"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Tampilkan versi rilis"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Penyesuaian kecerahan dari -100 ke 100 (0 berarti nihil)."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Cetak pesan pengawakutuan"
 
-#~ msgid "Brightness of scan"
-#~ msgstr "Kecerahan pemindaian"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Perbaiki berkas PDF yang dibuat dengan Simple Scan versi lawas"
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG."
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Gagal memindai"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Pemindaian sedang berlangsung"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian foto."
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[PERANGKAT...] — Utilitas pemindaian"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Mohon periksa instalasi Anda"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Jalankan \"%s --help\" untuk melihat daftar lengkap opsi yang tersedia."
diff --git a/po/insert-header.sin b/po/insert-header.sin
deleted file mode 100644
index b26de01..0000000
--- a/po/insert-header.sin
+++ /dev/null
@@ -1,23 +0,0 @@
-# Sed script that inserts the file called HEADER before the header entry.
-#
-# At each occurrence of a line starting with "msgid ", we execute the following
-# commands. At the first occurrence, insert the file. At the following
-# occurrences, do nothing. The distinction between the first and the following
-# occurrences is achieved by looking at the hold space.
-/^msgid /{
-x
-# Test if the hold space is empty.
-s/m/m/
-ta
-# Yes it was empty. First occurrence. Read the file.
-r HEADER
-# Output the file's contents by reading the next line. But don't lose the
-# current line while doing this.
-g
-N
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}
diff --git a/po/it.gmo b/po/it.gmo
deleted file mode 100644
index 23f8072..0000000
--- a/po/it.gmo
+++ /dev/null
diff --git a/po/it.po b/po/it.po
index 4b78ad2..398aa0a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,520 +1,538 @@
 # Italian 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.
+# Gianvito Cavasoli <gianvito@gmx.it>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-09-09 14:44+0200\n"
+"Last-Translator: Gianvito Cavasoli <gianvito@gmx.it>\n"
+"Language-Team: Italiano <gnome-it-list@gnome.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizza"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositivo di acquisizione"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Nome utente per la risorsa:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositivo SANE da cui acquisire le immagini."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "Pass_word:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipo del documento da acquisire"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Fronte e retro"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipo del documento da acquisire. Questa impostazione influenza la "
+"risoluzione, il numero dei colori e l'elaborazione successiva "
+"all'acquisizione."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Fronte"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Larghezza del foglio in decimi di mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Retro"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La larghezza del foglio in decimi di mm (0 per il rilevamento automatico)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Altezza del foglio in decimi di mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'altezza del foglio in decimi di mm (0 per il rilevamento automatico)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Luminosità dell'acquisizione"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+"La regolazione della luminosità da -100 a 100 (0 per alcuna luminosità)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrasto dell'acquisizione"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Risoluzione per acquisizione testo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Risoluzione per acquisizione foto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Lato della pagina da acquisire"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Lato della pagina da acquisire."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directory dove salvare i file"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Indica il valore della qualità per la compressione JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Indica il valore della qualità per la compressione JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Ritardo tra le pagine in millisecondi"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Ritardo tra le pagine in millisecondi."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Documento"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Acquisisci documenti"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "_Acquisisci"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Un modo molto semplice per acquisire documenti e foto. È possibile "
+"ritagliare le parti non necessarie di una foto e ruotarla se è nel verso "
+"sbagliato. È anche possibile stampare i file acquisiti, esportarli in "
+"formato PDF o salvarli in vari formati di immagine."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan usa il framework SANE per supportare il maggior numero di "
+"scanner esistenti."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Scansiona documenti"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;scansiona;adf;acquisizione;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Pagina singola"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "_Tutte le pagine dal caricatore"
+msgstr "_Tutte le pagine dall'alimentatore documenti"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Ferma l'acqui_sizione"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pagine _multiple dallo scanner"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Testo"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Documento"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Acquisisci"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Interrompi acqui_sizione"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Riordina pagine"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Ruota a _sinistra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Ruota a _destra"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
-msgstr "_Ritaglio"
+msgstr "_Ritaglia"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nessuno"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
-msgstr "US _Letter"
+msgstr "_Lettera"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr "Le_gal"
+msgstr "Le_gale"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalizzato"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Ruota ritaglio"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Sposta a sinistra"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Sposta a destra"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "A_iuto"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Sommario"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Crea un nuovo documento"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nuovo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Acquisisce una pagina singola dallo scanner"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Acquisisci"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Salva documento in un file"
+msgstr "Salva il documento su un file"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Salva"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Interrompe l'acquisizione in corso"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
-msgstr "Ferma"
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Ruota la pagina a sinistra (senso antiorario)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Ruota a sinistra"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Ruota la pagina a destra (senso orario)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Ruota a destra"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Ritaglia la pagina selezionata"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Ritaglia"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferenze"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "S_orgente di acquisizione:"
+msgstr "Interrompi"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Risoluzione _testo:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Risoluzione foto:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Ricerca degli scanner…"
 
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Lato acquisizione:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Dimensione pagina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Luminosità:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrasto:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualità:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Scansiona documenti"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Acquisisci documenti"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Chiudi"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;scansiona;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Sono richiesti nome utente e password per accedere a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Pronto per l'acquisizione"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Un modo molto semplice per acquisire documenti e foto. È possibile "
-"ritagliare le parti non necessarie di una foto e ruotarla se è nel verso "
-"sbagliato. È anche possibile stampare i file acquisiti esportarli in formato "
-"PDF o salvarli in vari formati di immagine."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Software aggiuntivo necessario"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan usa il framework SANE per supportare il maggior numero di "
-"scanner esistenti."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Nessuno scanner disponibile. Collegare uno scanner."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Impossibile connettersi allo scanner"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Impossibile avviare l'acquisizione"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Acquisizione non riuscita"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIVO...] - Strumento per l'acquisizione"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Eseguire \"%s --help\" per l'elenco completo delle opzioni disponibili a "
-"riga di comando."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Chiudi"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Sono richiesti nome utente e password per accedere a «%s»"
+"È necessario <a href=\"install-firmware\">installare il software del driver</"
+"a> dello scanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nessuno scanner rilevato"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controllare che lo scanner sia collegato e acceso"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Software aggiuntivo necessario"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "È necessario installare i driver dello scanner."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Salva come..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Salva come…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Salva"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr "Documento-acquisito.pdf"
+msgstr "Documento acquisito.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "File immagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tutti i file"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-pagina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (compresso)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
-msgstr "PNG (senza perdita di qualità)"
+msgstr "PNG (senza perdita)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (compresso)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Formato file:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressione:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Un file con il nome «%s» esiste già. Sostituirlo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Sostituisci"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Salvataggio"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Salvataggio file non riuscito"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Se non si salva le modifiche andranno perse per sempre."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Se non si salva, le modifiche saranno perse per sempre."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Salvare il documento corrente?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Scanner in contatto…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr ""
 "Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Unisci lati"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Unisci lati (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Inverso"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Mantieni non modificato"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -529,457 +547,529 @@ 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 e/o "
-"modificarlo\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"
+"Questo programma è software libero; è possibile ridistribuirlo e/o\n"
+"modificarlo secondo i termini della GNU General Public License come\n"
+"pubblicato dalla Free Software Foundation; sia la versione 3 della\n"
+"licenza, o (a propria scelta) una versione successiva.\n"
 "\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"
+"Questo programma è distribuito nella speranza che sia utile,\n"
+"ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di\n"
+"COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la\n"
+"GNU General Public License per ulteriori dettagli.\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/>."
+"Dovreste aver ricevuto una copia della GNU General Public License\n"
+"con questo programma. In caso contrario, vedere <http://www.gnu.org/licenses/"
+">."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 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"
-"  Federico https://launchpad.net/~federico+\n"
-"  Federico Foschini https://launchpad.net/~undicizeri\n"
-"  Giasone https://launchpad.net/~giasone\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"
-"  lory https://launchpad.net/~lorenzo-themax\n"
-"  matrobriva https://launchpad.net/~matrobriva\n"
-"  phede92 https://launchpad.net/~phede92"
+"Gianvito Cavasoli <gianvito@gmx.it>\n"
+"\n"
+"...e un ringraziamento ai precedenti traduttori da Rosetta."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Salvare il documento prima di uscire?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Sembra essere uno scanner «Brother»."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"I driver per questo dispositivo sono disponibili sul <a "
-"href=\"http://support.brother.com\">sito web Brother</a>."
+"I driver per questo dispositivo sono disponibili sul <a href=\"http://"
+"support.brother.com\">sito web Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Sembra essere uno scanner «Samsung»."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"I driver per questo dispositivo sono disponibili sul <a "
-"href=\"http://samsung.com/support\">sito web Samsung</a>."
+"I driver per questo dispositivo sono disponibili sul <a href=\"http://"
+"samsung.com/support\">sito web Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Sembra essere uno scanner «HP»."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Sembra essere uno scanner «Epson»."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "I driver sono disponibili dal <a href=\"http://support.epson.com\">sito web "
 "Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr "Installazione dei driver"
+msgstr "Installare i driver"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
-"Una volta completata l'installazione sarà necessario riavviare Simple Scan."
+"Una volta completata l'installazione sarà necessario riavviare "
+"l'applicazione."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Installazione dei driver..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Installazione dei driver…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Driver installati con successo."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Installazione dei driver non riuscita (codice errore %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Installazione driver non riuscita."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "È necessario installare i seguenti pacchetti: %s."
-
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (predefinita)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (bozza)"
-
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (alta risoluzione)"
-
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nuovo documento"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Documento"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Email..."
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "È necessario installare il pacchetto %s."
+msgstr[1] "È necessario installare i pacchetti %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferenze"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Stampa..."
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Scorciatoie da tastiera"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "Informazioni"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
 msgstr "Esci"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Cambia _scanner"
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "Email"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installa driver"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Avvia di nuovo…"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatico"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Ruota la pagina a sinistra (senso antiorario)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Più scura"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Ruota la pagina a destra (senso orario)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Più chiara"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Ritaglia la pagina selezionata"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Minore"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Elimina la pagina selezionata"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Maggiore"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minima"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizza"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Massima"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Nome utente per la risorsa:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Salvataggio del documento..."
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "Pass_word:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Salvataggio pagina %d di %d"
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
-
-#~ msgid "Files missing"
-#~ msgstr "File mancanti"
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Impossibile codificare la pagina %i"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Acquisizione"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Acquisisce una pagina singola"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Acquisisce tutte le pagine dall'alimentatore automatico di documenti "
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Acquisisce continuamente da uno scanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Interrompe l'acquisizione in corso"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Altezza della finestra in pixel"
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modifiche al documento"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Sposta la pagina a sinistra"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Sposta la pagina a destra"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Ruota la pagina a sinistra (senso antiorario)"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Larghezza della finestra in pixel"
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Ruota la pagina a destra (senso orario)"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Altezza dell'immagine acquisita in pixel"
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Elimina la pagina"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestione del documento"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Avvia un nuovo documento"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Salva il documento acquisito"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Invia per email il documento acquisito"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Stampa il documento acquisito"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copia l'attuale pagina negli appunti"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Direzione dell'acquisizione"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Scanner"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Risoluzione dell'ultima immagine acquisita"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Lati acquisizione"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Larghezza dell'immagine acquisita in pixel"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Dimensione pagina"
 
-#~ msgid "Select File _Type"
-#~ msgstr "Seziona il _tipo di file"
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Fronte"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Risoluzione per acquisizione testo"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Retro"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Risoluzione per acquisizione foto"
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Entrambi"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Ritardo"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Pagine multiple dallo scanner"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Secondi"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Acquisizione"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipo del documento da acquisire"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "Risoluzione _testo"
 
-#~ 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."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "Risoluzione _foto"
 
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Altezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
-#~ "all'ultima acquisizione."
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Luminosità"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr ""
-#~ "La risoluzione in punti per pollice del documento precedentemente acquisito."
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Contrasto"
 
-#~ 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."
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Qualità"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Documento acquisito"
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatico"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Directory dove salvare i file"
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Più scura"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositivo di acquisizione"
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Più chiara"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositivo SANE da cui acquisire le immagini."
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Minore"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "VERO se la finestra dell'applicazione è massimizzata"
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Maggiore"
 
-#~ 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)"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (predefinita)"
 
-#~ 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."
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (bozza)"
 
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Uso:\n"
-#~ "  %s [DISPOSITIVO...] - Strumento di acquisizione"
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (alta risoluzione)"
 
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, 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+"
+msgid "%d dpi"
+msgstr "%d dpi"
 
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nessuno scanner disponibile. Collegare uno scanner."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Impossibile connettersi allo scanner"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Impossibile avviare l'acquisizione"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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 dell'applicazione"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Acquisizione non riuscita"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Acquisizione in corso"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIVO…] - Strumento per l'acquisizione"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, 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 "Please check your installation"
-#~ msgstr "Verificare l'installazione"
-
-#~ 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 "Page side to scan"
-#~ msgstr "Lato della pagina da acquisire"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Altezza del foglio in decimi di mm"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Larghezza del foglio in decimi di mm"
-
-#~ 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."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Lato della pagina da acquisire."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "La direzione dell'acquisizione lungo la pagina."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Tipo del documento da acquisire. Questa impostazione influenza la "
-#~ "risoluzione, il numero dei colori e l'elaborazione successiva "
-#~ "all'acquisizione."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "L'altezza del foglio in decimi di mm  (0 per il rilevamento automatico)."
-
-#~ msgid ""
-#~ "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)."
-
-#~ 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."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrasto dell'acquisizione"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Luminosità dell'acquisizione"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "La regolazione del contrasto da -100 a 100 (0 per alcun contrasto)."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr ""
-#~ "La regolazione della luminosità da -100 a 100 (0 per alcuna luminosità)."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Indica il valore della qualità per la compressione JPEG"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Indica il valore della qualità per la compressione JPEG"
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Eseguire «%s --help» per l'elenco completo delle opzioni disponibili a riga "
+"di comando."
diff --git a/po/ja.gmo b/po/ja.gmo
deleted file mode 100644
index 8614803..0000000
--- a/po/ja.gmo
+++ /dev/null
diff --git a/po/ja.po b/po/ja.po
index 15b3a11..42f9777 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2014-11-20 05:14+0000\n"
 "Last-Translator: Kentaro Kazuhama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "認証(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "リソースに対するユーザ名(_U):"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "表面と裏面"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "表面"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "戻る"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "シンプルスキャン"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "ドキュメント(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "スキャン(_A)"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "一枚のページ(_P)"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "フィーダより全てのページ(_F)"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "スキャン停止(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "テキスト"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "写真"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "ページを再整列"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "電子メール(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "ページ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "左へ回転(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "右へ回転(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "切り抜き(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "なし(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "US レター(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US リーガル(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "切り抜きを回転(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "左へ移動"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "右へ移動"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "コンテンツ(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "新規ドキュメントの作成"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "新規"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "一枚のページをスキャンします"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "スキャン"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "保存"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "スキャンを停止します"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ページを左回転 (反時計回り)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "左へ回転"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ページを右回転 (時計回り)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "右へ回転"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "選択した範囲の切り抜き"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "切り抜き"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "設定"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "スキャンする対象(_O):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "テキストの画素数(_T):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "写真の画素数(_P):"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "スキャン面:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "ページサイズ:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "明るさ:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "コントラスト:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "品質:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "ドキュメントスキャナ―"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "ドキュメントをスキャンします"
 
@@ -308,7 +322,7 @@ msgstr "scan;scanner;flatbed;adf;スキャン;スキャナー;フラットベッ
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -318,196 +332,207 @@ msgstr ""
 "ドキュメントや写真を本当に簡単な方法でスキャンします。写真の不要な部分を切り取ったり、間違った方向に向いている場合は回転できます。スキャンしたものを印刷、"
 "PDFへのエクスポート、多くの画像フォーマットに保存することができます。"
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "シンプル スキャンはSANE フレームワークを採用しており、多数の既存スキャナに対応しています。"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "利用可能なスキャナがありません。スキャナを接続してください。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "スキャナに接続できません"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "スキャンを開始できません"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "スキャナとの通信に失敗しました"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "リリースバージョンを表示"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "デバッグメッセージを表示"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "スキャンに失敗しました"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[デバイス...] - スキャンユーティリティ"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "'%s --help' を実行すると利用可能なすべてのコマンドラインオプションの一覧が表示されます"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' にアクセスするにはユーザ名とパスワードが必要です"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "スキャナが検出されていません"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "スキャナが接続されて電源が入っているか確認してください"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr "追加ソフトウェアが必要です"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr "スキャナに対応したドライバー ソフトウェアをインストールする必要があります。"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "スキャンされたドキュメント.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "画像ファイル"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "すべてのファイル"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (複数ページ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (圧縮済み)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (ロスレス)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "ファイルフォーマット:"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "ファイルの保存に失敗しました"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "現在のドキュメントを保存しますか?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "変更を破棄"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "プレビュー用の画像を保存できません"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "画像プレビューアプリケーションを開けませんでした"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "面を結合"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "面を結合(逆順)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "逆順"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "無変更を維持"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "ヘルプファイルを開くことができません"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -536,20 +561,20 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Akira Tanaka https://launchpad.net/~akira-tanaka\n"
+"  Akira Tanaka https://launchpad.net/~popo1897\n"
 "  Hajime Mizuno https://launchpad.net/~mizuno-as\n"
 "  Jeroen Hoek https://launchpad.net/~mail-jeroenhoek\n"
 "  Jun Kobayashi https://launchpad.net/~jkbys\n"
@@ -562,22 +587,22 @@ msgstr ""
 "  kaneisland https://launchpad.net/~kaneisland"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "終了する前にドキュメントを保存しますか?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "保存せずに終了"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr "ブラザー製スキャナーを見つけました。"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -586,12 +611,12 @@ msgstr ""
 "href=\"http://support.brother.com\">Brotherのウェブサイト</a>から入手できます。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr "Samsung製スキャナーを見つけました。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -600,17 +625,17 @@ msgstr ""
 "から入手できます。"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr "HP製スキャナーを見つけました。"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr "エプソン製スキャナーを見つけました。"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -618,138 +643,138 @@ msgstr ""
 "このスキャナーのドライバーは、<a href=\"http://support.epson.com\">Epsonウェブサイト</a>から入手できます。"
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "ドライバーのインストール手順"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "ドライバーのインストール後、シンプル スキャンを再起動する必要があります。"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "ドライバーをインストールしています..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "ドライバーのインストールに成功しました!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "ドライバーのインストールに失敗しました(エラーコード %d)。"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr "ドライバーのインストールに失敗しました。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "%s パッケージをインストールする必要があります。"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (標準)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ドラフト)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "新しいドキュメント"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "ドキュメント"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "メール..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "印刷..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "このプログラムについて"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "終了"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "ドライバーをインストール (_I)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "暗く"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "明るく"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "弱く"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "強く"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "ドキュメントを保存しています..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%2$dページ中%1$dページを保存しています"
diff --git a/po/kk.gmo b/po/kk.gmo
deleted file mode 100644
index d94d46d..0000000
--- a/po/kk.gmo
+++ /dev/null
diff --git a/po/kk.po b/po/kk.po
index 777ca09..7f2eba0 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -6,506 +6,507 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-04-17 06:12+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-06-25 08:37+0000\n"
+"PO-Revision-Date: 2017-06-25 19:23+0500\n"
+"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.12\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
 msgstr ""
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
 msgstr ""
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Құпия сөз:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Бет жағы"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr ""
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Сырты"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG сығуы үшін үнсіз келісім бойынша мәні"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG сығуы үшін үнсіз келісім бойынша мәні."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Беттер арасындағы кідіріс уақыты, миллисекунд"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Беттер арасындағы кідіріс уақыты, миллисекунд."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr ""
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
 msgstr ""
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr ""
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr ""
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr ""
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Мәтін"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Фото"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "Құ_жат"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Ск_анерлеу"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Сканерлеуді _тоқтату"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "_Солға бұру"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "_Оңға бұру"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ешнәрсе"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
-msgstr ""
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
-msgstr ""
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
-msgstr ""
+msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
-msgstr ""
+msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr ""
+msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
-msgstr ""
+msgstr "Таң_дауыңызша"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
-msgstr ""
+msgstr "Солға жылжыту"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
-msgstr ""
+msgstr "Оңға жылжыту"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Көмек"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "Құра_масы"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr ""
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Жаңа"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Іздеу"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr ""
+msgstr "Құжатты файлға сақтау"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Сақтау"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Тоқтау"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Солға бұру"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Оңға бұру"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr ""
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Қиып жіберу"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Баптаулары"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr ""
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr ""
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr ""
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr ""
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr ""
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr ""
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr ""
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Жабу"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
 msgstr ""
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr ""
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr ""
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr ""
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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:391
-msgid "Failed to scan"
-msgstr ""
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr ""
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr ""
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr ""
+msgstr "Сканерлер табылмады"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Қалайша сақтау..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Қалайша сақтау…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
-msgstr ""
+msgstr "_Бас тарту"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
-msgstr ""
+msgstr "_Сақтау"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr ""
+msgstr "Сканерленген құжат.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
-msgstr ""
+msgstr "Сурет файлдары"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (көпбетті құжат)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (сығылған)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (жоғалтусыз)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (сығылған)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Файл пішімі:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Сығу:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "\"%s\" деп аталатын файл бар болып тұр. Оны алмастыруды қалайсыз ба?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "А_лмастыру"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Сақталуда"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
-msgstr ""
+msgstr "Файлды сақтау сәтсіз аяқталды"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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:708
+#: src/app-window.vala:591
 msgid "Save current document?"
-msgstr ""
+msgstr "Ағымдағы құжатты сақтау керек пе?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr ""
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -522,206 +523,484 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "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:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Сақтамай-ақ шығу"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Драйверлерді орнату"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Драйверлерді орнату…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Драйверлер сәтті орнатылды!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] ""
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Баптаулары"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Көмек"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Осы туралы"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Шығу"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Эл. пошта"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Қайтадан бастау…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr ""
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Бас тарту"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Құпия сөз:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
+msgid "Unable to encode page %i"
 msgstr ""
 
-#: ../src/ui.vala:1835
-msgid "New Document"
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Сканерлеу"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
 msgstr ""
 
-#: ../src/ui.vala:1840
-msgid "Document"
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
 msgstr ""
 
-#: ../src/ui.vala:1844
-msgid "Email..."
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
 msgstr ""
 
-#: ../src/ui.vala:1845
-msgid "Print..."
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
 msgstr ""
 
-#: ../src/ui.vala:1853
-msgid "Help"
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
 msgstr ""
 
-#: ../src/ui.vala:1854
-msgid "About"
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Парақты солға жылжыту"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Парақты оңға жылжыту"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
 msgstr ""
 
-#: ../src/ui.vala:1855
-msgid "Quit"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
 msgstr ""
 
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Жаңа құжатты бастау"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Сканерленген құжатты сақтау"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Сканерленген құжатты эл. поштамен жіберу"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Сканерленген құжатты баспаға шығару"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr ""
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Сканер"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr ""
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Бет өлшемі"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Бет жағы"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Сырты"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Екеуі де"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Кідіріс"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple page from flatbed"
+msgstr ""
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Секунд"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Сканерлеу"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr ""
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr ""
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Жарықтылығы"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Контраст"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Сапасы"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Авто"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
-msgstr ""
+msgstr "Қүңгірттеу"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
-msgstr ""
+msgstr "Ашықтау"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
+msgstr "Көбірек"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
 msgstr ""
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
 msgstr ""
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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/ui.vala:2008
-msgid "Saving document..."
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#: ../src/ui.vala:2173
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr ""
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr ""
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ҚҰРЫЛҒЫ…] — Сканерлеу утилитасы"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-msgid "Saving page %d out of %d"
+msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
+"Командалық жолдың барлық опцияларын қарау үшін \"%s --help\" енгізіңіз."
+
+#~ msgid "New"
+#~ msgstr "Жаңа"
+
+#~ msgid "Rotate Left"
+#~ msgstr "Солға бұру"
+
+#~ msgid "Rotate Right"
+#~ msgstr "Оңға бұру"
+
+#~ msgid "Crop"
+#~ msgstr "Қиып жіберу"
diff --git a/po/km.gmo b/po/km.gmo
deleted file mode 100644
index 2c140b8..0000000
--- a/po/km.gmo
+++ /dev/null
diff --git a/po/km.po b/po/km.po
index 463ab15..74f34a2 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "ការ​អនុញ្ញាត"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "ឈ្មោះ​អ្នកប្រើ​ធនធាន ៖"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "ពាក្យសម្ងាត់ ៖"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "មុខ នឹង​ក្រោយ"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "មុខ"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "ថយក្រោយ"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "ស្កេន​ធម្មតា"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "ឯកសារ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "ស្កេន"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "ទំព័រ​ម្ខាង"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "ទំព័រ​ទាំងអស់​ពី​កម្មវិធី​មតិ"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "ឈប់​ស្កេន"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "អត្ថបទ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "រូបថត"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "ការរៀបចំទំព័រ"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "អ៊ីមែល"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "ទំព័រ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "បង្វិល​ស្ដាំ"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "ច្រឹប"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "គ្មាន"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "សំបុត្រ"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "ស្រប​ច្បាប់"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "ផ្ទាល់ខ្លួន"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "បង្វិល​ការ​ច្រឹប"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "ផ្លាស់ទី​ទៅ​ឆ្វេង"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "ផ្លាស់ទី​ទៅ​ស្ដាំ"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "ជំនួយ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "មាតិកា"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "ចាប់ផ្ដើម​ឯកសារ​ថ្មី"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "ថ្មី"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "ស្កេន​ទំព័រ​ទោល​ពី​ម៉ាស៊ីន​ស្កេន"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "ស្កេន"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "រក្សាទុក​ឯកសារ​ទៅ​ឯកសារ"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "រក្សាទុក"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "បញ្ឈប់​ការ​ស្កេន​បច្ចុប្បន្ន"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "ឈប់"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "បង្វិល​ទំព័រ​ទៅ​ឆ្វេង (ច្រាស​ទ្រនិច​នាឡិកា)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "បង្វិល​ទំព័រ​ទៅ​ស្ដាំ (ស្រប​ទ្រនិច​នាឡិកា)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "បង្វិល​ស្ដាំ"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "ច្រឹប​ទំព័រ​ដែល​បាន​ជ្រើស"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "ច្រឹប"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "ចំណូលចិត្ត"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "ស្កេន​ប្រភព ៖"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "គុណភាព​បង្ហាញ​អត្ថបទ ៖"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "គុណភាព​បង្ហាញ​រូបថត ៖"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "ស្កេន​ចំហៀង ៖"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "ទំហំ​ទំព័រ ៖"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "ពន្លឺ ៖"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "កម្រិត​ពណ៌ ៖"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "គុណភាព ៖"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "ម៉ាស៊ីនស្កេនឯកសារ"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "ស្កេន​ឯកសារ"
 
@@ -308,7 +322,7 @@ msgstr "ស្កេន;ម៉ាស៊ីនស្កេន;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,202 +330,213 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ពុំ​មាន​ម៉ាស៊ីន​ស្កេន​ទេ សូម​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន ។"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "មិន​អាច​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន​បាន​ទេ"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ស្កេន​បាន​ទេ"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "កំហុស​ក្នុង​ការ​ទាក់ទង​ទៅកាន់​ម៉ាស៊ីន​ស្កេន"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "បង្ហាញ​កំណែ​ការ​ចេញផ្សាយ"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "បោះពុម្ព​សារ​បំបាត់​កំហុស"
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ស្កេន"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ឧបករណ៍...] - ការ​ស្កេន​ឧបករណ៍​ប្រើប្រាស់"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "ដំណើរការ '%s --help' ដើម្បី​មើល​បញ្ជី​ពេញលេញ​នៃ​បន្ទាត់​បញ្ជា​ដែល​មាន ។"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "បិទ"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ទាមទារ​ឈ្មោះ​អ្នកប្រើ និង​ពាក្យសម្ងាត់​ដើម្បី​ចូលដំណើរការ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "រក​មិន​ឃើញ​ម៉ាស៊ីន​ស្កេន"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "សូម​ពិនិត្យមើល​ម៉ាស៊ីន​ស្កេន​របស់​អ្នក​ថា​តើ​បាន​តភ្ជាប់ "
 "និង​បើក​កុងតាក់​ហើយ​ឬនៅ"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "រក្សាទុក​ជា..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "បោះបង់"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "រក្សាទុក"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf ដែល​បាន​ស្កេន"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "ឯកសារ​រូបភាព"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "ឯកសារ​ទាំងអស់"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (ឯកសារ​ច្រើន​ទំព័រ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (បាន​បង្ហាប់)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (គ្មាន​ការ​បាត់បង់)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "ទ្រង់ទ្រាយ​ឯកសារ ៖"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​ឯកសារ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "រក្សាទុក​ឯកសារ​បច្ចុប្បន្ន ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "បោះបង់​ការ​ផ្លាស់ប្ដូរ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "មិន​អាច​រក្សាទុក​រូបភាព​សម្រាប់​ការ​មើល​ជាមុន​បាន​ទេ"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "មិន​អាច​បើក​កម្មវិធី​មើល​រូបភាព​ជាមុន​បាន​ទេ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "ផ្សំភាគី"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "ផ្សំភាគី (បញ្ច្រាស)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "បញ្ច្រាស"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "រក្សា​ឱ្យមិនមានការ​ផ្លាស់​ប្តូ​រ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "មិន​អាច​បើក​ឯកសារ​ជំនួយ​បាន​ទេ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -541,16 +566,16 @@ msgstr ""
 "សូម​មើល<http://www.gnu.org/licenses/> ។"
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "អំពី​ការ​ស្កេន​ធម្មតា"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "ឧបករណ៍​ស្កេន​ធម្មតា"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -560,189 +585,189 @@ msgstr ""
 "  Seng Sutha https://launchpad.net/~sutha"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "រក្សាទុក​ឯកសារ​មុន​ពេល​បិទ​ឬ ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "បិទ​ដោយ​មិន​រក្សាទុក"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (លំនាំដើម)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ពង្រាង)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "ឯកសារ​ថ្មី"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "ឯកសារ"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "អ៊ីមេល..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "បោះពុម្ព..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "ជំនួយ​"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "អំពី"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "ចេញ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "ប្ដូរ​ម៉ាស៊ីន​ស្កេន"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "ងងឹត"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "ស្រាល"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "តិចជាង"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "ផ្សេងទៀត"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "អប្បបរមា"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "អតិបរមា"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "កំពុង​រក្សាទុក​ឯកសារ..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %d"
diff --git a/po/ko.gmo b/po/ko.gmo
deleted file mode 100644
index fb63022..0000000
--- a/po/ko.gmo
+++ /dev/null
diff --git a/po/ko.po b/po/ko.po
index f43509d..ea6b9ed 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2016-06-01 06:12+0000\n"
-"Last-Translator: MinSoo Kim <misol@korea.ac.kr>\n"
+"Last-Translator: Min-Soo Kim <misol.kr@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "인증(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "리소스에 대한 사용자 이름(_U):"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "비밀번호(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "앞뒤"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "앞면"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "뒷면"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "심플 스캔"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "문서(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "스캔(_A)"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "단일 페이지(_P)"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "스케너의 모든 페이지(_F)"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "스캔 중지(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "텍스트"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "사진"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "페이지 다시 정렬"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "이메일(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "페이지(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "왼쪽으로 돌리기(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "오른쪽으로 돌리기(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "잘라내기(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "없음(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "편지(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "미국  법정 규격(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "사용자 설정(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "잘라낸 영역 회전(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "왼쪽으로 이동"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "오른쪽으로 이동"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "도움말(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "내용(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "새 문서 시작"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "새로 만들기"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "스캐너로부터 한 페이지 스캔"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "스캔"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "파일로 문서 저장하기"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "저장"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "현재 스캔 중지"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "정지"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "페이지를 왼쪽으로 회전 (시계 반대 방향)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "왼쪽으로 회전"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "페이지를 오른쪽으로 회전 (시계 방향)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "오른쪽으로 회전"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "선택한 페이지 자르기"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "잘라내기"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "기본 설정"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "스캔 원본(_O)"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "텍스트 해상도(_T)"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "사진 해상도(_P)"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "가장자리 스캔:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "페이지 크기:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "밝기:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "명암:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "품질:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "문서 스캐너"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "스캔 문서"
 
@@ -308,7 +322,7 @@ msgstr "scan;스캔;scanner;스캐너;flatbed;평판 스캐너;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -318,196 +332,207 @@ msgstr ""
 "문서나 사진을 스캐닝하는 쉬운 방법입니다. 사진에서 쓰지 않는 부분을 잘라내거나 방향이 틀리면 돌려서 바로잡을 수 있습니다. 스캐닝한 "
 "것을 출력하거나, pdf 파일로 내보내거나, 여러 가지 형식으로 저장할 수 있습니다."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "심플 스캔은 현존하는 거의 모든 스캐너들을 지원하는 SANE 프레임워크를 사용합니다."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "사용할 수 있는 스캐너가 없습니다. 스캐너를 연결하세요."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "스캐너에 연결할 수 없음"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "스캔을 시작할 수 없음"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "스캐너와의 통신 에러"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "릴리즈 버전 보이기"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "디버깅 메세지 표시"
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "스캔 실패"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[장치...] - 스캐닝 도구"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "사용 가능한 모든 옵션의 목록을 보려면 '%s --help' 명령을 실행하십시오."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "닫기(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s'에 접근하려면 사용자 이름과 암호가 필요합니다"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "감지된 스캐너 없음"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "스캐너와 연결되어있는지, 전원이 켜져 있는지 확인해 주세요"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr "추가 소프트웨어 필요"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr "스캐너용 드라이버를 설치해야 합니다."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "저장(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "스캔한 문서.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "그림 파일"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "모든 파일"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (복수 페이지 문서)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (압축된)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (무손실)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "파일 형식:"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "파일 저장 실패"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "현재 문서를 저장하시겠습니까?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "바뀐 내용 버리기"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "미리 보기 그림을 저장할 수 없습니다."
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "그림 미리보기 프로그램을 열 수 없습니다"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "측면 결합"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "측면 결합(역순)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "역순"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "바꾸지 않은 상태 유지"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "도움말 파일을 열 수 없습니다"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -536,16 +561,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "심플 스캔 소개"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "간단한 문서 스캐닝 도구"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -555,28 +580,28 @@ msgstr ""
 "  Kim Boram https://launchpad.net/~boramism\n"
 "  Koongchi https://launchpad.net/~kama8644-g\n"
 "  Lyuso https://launchpad.net/~lutinaroa\n"
-"  MinSoo Kim https://launchpad.net/~misol\n"
+"  Min-Soo Kim https://launchpad.net/~misol\n"
 "  Seung Soo, Ha https://launchpad.net/~sungsuha-deactivatedaccount\n"
 "  Sunil https://launchpad.net/~sodoetha\n"
 "  atto https://launchpad.net/~kpsman"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "종료하기 전에 문서를 저장하시겠습니까?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "저장하지 않고 종료"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr "Brother 스캐너를 가지고 계신 것 같습니다"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -584,12 +609,12 @@ msgstr ""
 "사용 가능한 드라이버 확인 <a href=\"http://support.brother.com\">Brother website</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr "삼성 스캐너를 가지고 계신 것 같습니다."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -597,17 +622,17 @@ msgstr ""
 "사용 가능한 드라이버 확인 <a href=\"http://samsung.com/support\">Samsung website</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr "HP 스캐너를 가지고 계신 것 같습니다."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr "Epson 스캐너를 가지고 계신 것 같습니다."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -615,138 +640,138 @@ msgstr ""
 "사용 가능한 드라이버 확인 <a href=\"http://support.epson.com\">Epson website</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "드라이버 설치"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "드라이버 설치 후엔 심플 스캔을  다시 시작해야 합니다."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "드라이버를 설치하고 있습니다..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "드라이버를 설치했습니다!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "드라이버 설치 실패 (에러 코드 %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr "드라이버 설치에 실패했습니다."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "%s 패키지를 설치해야 합니다."
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (기본값)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (초안)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "새 문서"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "문서"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "이메일..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "인쇄..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "도움말"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "소개"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "끝내기"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "스캐너 변경(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "드라이버 설치(_I)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "자동 설정"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "어둡게"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "밝게"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "적게"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "많이"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "최소"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "최대"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "문서 저장..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d 페이지(전체 %d 페이지) 저장 중"
diff --git a/po/ku.gmo b/po/ku.gmo
deleted file mode 100644
index 68ebe4c..0000000
--- a/po/ku.gmo
+++ /dev/null
diff --git a/po/ku.po b/po/ku.po
index 73a4e52..06970a2 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2017-02-28 22:55+0000\n"
 "Last-Translator: Euphrates <f_akad@hotmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
+"Language: ku\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-03-01 05:37+0000\n"
-"X-Generator: Launchpad (build 18329)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Rayedar bike"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Şîfre:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Pêş"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Paş"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr ""
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Nivîs"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Wêne"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Bizivirîne _Çepê"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Bizivirîne _Rastê"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Jê Bike"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Tune"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Taybet"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Alîkarî"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Naverok"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Nû"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Venihêre"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Tomar Bike"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Sekinandin"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Bizivirîne Çepê"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Bizivirîne Rastê"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Bibire"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Vebijêrk"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Biriqandin:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "çawanî:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -306,9 +320,9 @@ msgstr ""
 
 #: data/simple-scan.desktop.in:8
 msgid "scanner"
-msgstr "Skener"
+msgstr "scanner"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "îlan version bibînin"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "_Bigire"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Cuda Tomar Bike..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Betal"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Tomar bike"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Pelên Wêne"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Hemû Pel"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "Formata pelan:"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ger hûn tomar nekin, wê guhertin heta hetayê wenda bibin."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Guhertinan Jê Bibe"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -539,189 +564,189 @@ msgstr ""
 "  Rokar ✌ https://launchpad.net/~rokarali"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Pelgeya nû"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Belge"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Çapkirin..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Alîkarî"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Der barê"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Derkeve"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Bixwe"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Kêmtir"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Bêhtir"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2182
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ky.gmo b/po/ky.gmo
deleted file mode 100644
index fce5ae4..0000000
--- a/po/ky.gmo
+++ /dev/null
diff --git a/po/ky.po b/po/ky.po
index 7a7807f..36ef370 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-04-17 06:12+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
+"PO-Revision-Date: 2017-03-29 06:36+0000\n"
+"Last-Translator: Saltanat Osmonova <Unknown>\n"
 "Language-Team: Kirghiz <ky@li.org>\n"
+"Language: ky\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
-msgstr ""
+msgstr "Алды жана Арты"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
-msgstr ""
+msgstr "Алды"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
-msgstr ""
+msgstr "Арты"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr ""
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr ""
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
-msgstr ""
+msgstr "Фото"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
-msgstr ""
+msgstr "_Солго тегеретүү"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
-msgstr ""
+msgstr "_Оңго тегеретүү"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
-msgstr ""
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
-msgstr ""
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
-msgstr ""
+msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
-msgstr ""
+msgstr "Солго жылуу"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
-msgstr ""
+msgstr "Оңго жылуу"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
-msgstr ""
+msgstr "Жаңы"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
-msgstr ""
+msgstr "Документти файлга сактоо"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
-msgstr ""
+msgstr "Сактоо"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
-msgstr ""
+msgstr "Солго тегеретүү"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
-msgstr ""
+msgstr "Оңго тегеретүү"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Тандалган баракты кесүү"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
-msgstr ""
+msgstr "Кесүү"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
-msgstr ""
+msgstr "Барактын чоңдугу"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/lt.gmo b/po/lt.gmo
deleted file mode 100644
index 16cba25..0000000
--- a/po/lt.gmo
+++ /dev/null
diff --git a/po/lt.po b/po/lt.po
index 5c49619..0f0ed99 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2,518 +2,528 @@
 # 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.
+# Aurimas Černius <aurisc4@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-11-05 18:11+0000\n"
-"Last-Translator: Moo <hazap@hotmail.com>\n"
-"Language-Team: Lithuanian <lt@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-22 23:00+0300\n"
+"Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
+"Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Į_galioti"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Skenavimo įrenginys"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Ištekliaus na_udotojo vardas:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE įrenginys, iš kurio gauti paveikslus."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "Sla_ptažodis:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Skenuojamo dokumento tipas"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Skenuojamo dokumento tipas. Šis nustatymas apsprendžia skaitymo raišką, "
+"spalvas ir baigiamąjį apdorojimą."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Abi pusės"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Popieriaus plotis dešimtosiomis milimetro dalimis"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Priekinė pusė"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Popieriaus plotis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
+"popieriaus aptikimui)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Galinė pusė"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Popieriaus aukštis dešimtosiomis milimetro dalimis"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Popieriaus aukštis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
+"popieriaus aptikimui)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Nuskenuoto dokumento skaistis"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Skaisčio derinimas nuo -100 iki 100 (0 nėra)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Nuskenuoto dokumento kontrastas"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrasto reguliavimas nuo -100 iki 100 (0 nėra)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Teksto skenavimo raiška"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Raiška taškais colyje skenuojant tekstą."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Nuotraukų skenavimo raiška"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Raiška taškais colyje skenuojant nuotraukas."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Skenuojama puslapio pusė"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Puslapio pusė, kurią skenuoti."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Katalogas, į kurį įrašyti failus"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Katalogas failams įrašyti. Jei nenustatyta, numatytoji reikšmė yra dokumentų "
+"katalogas."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kokybės reikšmė JPEG glaudinimui"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kokybės reikšmė, naudojama JPEG glaudinimui."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Delsa tarp puslapių milisekundėmis"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Delsa tarp puslapių milisekundėmis."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Paprastas skenavimas"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokumentas"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenuoti dokumentus"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "S_kenuoti"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Tikrai labai lengvas būdas skenuoti ir dokumentus, ir nuotraukas. Galite "
+"iškirpti blogas nuotraukos puses ir ją pasukti, jei ji neteisingai "
+"atvaizduojama. Galite spausdinti savo skenavimus, eksportuoti juos į pdf, ar "
+"įrašyti juos daugeliu paveikslų formatų."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Paprastas skenavimas naudoja SANE karkasą, kad palaikytų daugelį esamų "
+"skenerių."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentų skeneris"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skenuoti;nuskaityti;adf;skaitytuvas;skeneris;plokštuminis;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Vieną  _puslapį"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Visus puslapius iš _padaviklio"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stabdyti skenavimą"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Daug puslapių nuo skenavimo plokštumos"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekstas"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Nuotrauka"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokumentas"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "S_kenuoti"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stabdyti skenavimą"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Pakeisti puslapių tvarką"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Siųsti el. paštu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Puslapis"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Pasukti _kairėn"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Pasukti _dešinėn"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Apkirpti"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nėra"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Laiškas"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Tei_sinis"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Pasirinktinis"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Pasukti apkirpimą"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Perkelti kairėn"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Perkelti dešinėn"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Žinynas"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Turinys"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Pradėti naują dokumentą"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Naujas"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Skenuoti vieną puslapį iš skenerio."
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skenuoti"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Įrašyti dokumentą į failą"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Įrašyti"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Stabdyti esamą skenavimą"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stabdyti"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Pasukti puslapį kairėn (prieš laikrodžio rodyklę)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Pasukti kairėn"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Pasukti puslapį dešinėn (pagal laikrodžio rodyklę)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Pasukti dešinėn"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Apkirpti pažymėtą puslapį"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Ieškoma skenerių"
 
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Apkirpti"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Nuostatos"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Skenavimo š_altinis:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Teksto raiška:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Nuotraukos raiška:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skenuojama pusė:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Puslapio dydis:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Skaistis:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrastas:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kokybė:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentų skeneris"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skenuoti dokumentus"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Užverti"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skenuoti;nuskaityti;adf;skaitytuvas;skeneris;plokštuminis;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Naudotojo vardas ir slaptažodis, reikalingas prieigai prie „%s“"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "skeneris"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Pasiruošta skenavimui"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Tikrai labai lengvas būdas skenuoti ir dokumentus, ir nuotraukas. Galite "
-"iškirpti blogas nuotraukos puses ir ją pasukti, jei ji neteisingai "
-"atvaizduojama. Galite spausdinti savo skenavimus, eksportuoti juos į pdf, ar "
-"įrašyti juos daugeliu paveikslų formatų."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Reikalinga papildoma programinė įranga"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Paprastas skenavimas naudoja SANE karkasą, kad palaikytų daugelį esamų "
-"skenerių."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Nėra prieinamų skenerių. Prašome prijungti skenerį."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Nepavyko prisijungti prie skenerio"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Nepavyko pradėti skenavimo"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-msgid "Error communicating with scanner"
-msgstr "Klaida susisiekiant su skeneriu"
-
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "Rodyti laidos 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 sukurtus su senesnėmis „Paprasto skenavimo“ versijomis"
-
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "Skenavimas nepavyko"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ĮRENGINYS...] - Skenavimo paslaugų programa"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-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“."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Užverti"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Naudotojo vardas ir slaptažodis, reikalingas prieigai prie „%s“"
+"Jūs turite savo skeneriui <a href=\"install-firmware\">įdiegti tvarkyklę</a>."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Skenerių neaptikta"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Patikrinkite ar skeneris yra prijungtas ir įjungtas"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Reikalinga papildoma programinė įranga"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Jūs turite savo skeneriui įdiegti tvarkyklę."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Įrašyti kaip..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Įrašyti taip…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "Į_rašyti"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Nuskenuotas dokumentas.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Paveikslų failai"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Visi failai"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (kelių puslapių dokumentas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (suglaudintas)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (nenuostolingasis)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (suglaudintas)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Failo formatas:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Suspaudimas:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Failas pavadinimu „%s“ jau yra.  Ar norite jį perrašyti?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "Per_rašyti"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Įrašoma"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Nepavyko įrašyti failo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
 msgstr "Jeigu neįrašysite, pakeitimai bus negrįžtamai prarasti."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Įrašyti šį dokumentą?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Atmesti pakeitimus"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Jungiamasi prie _skenerio…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Nepavyko įrašyti paveikslo peržiūrai"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Nepavyko atverti paveikslų peržiūros programos"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Suskirstyti puses"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Suskirstyti puses (atvirkščiai)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Atvirkščiai"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Palikti nepakeistus"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Nepavyko atverti žinyno failo"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -543,16 +553,16 @@ msgstr ""
 "šia programa; jei negavote, žiūrėkite <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Apie Paprastą skenavimą"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Paprastas dokumentų skenavimo įrankis"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -561,284 +571,517 @@ msgstr ""
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
 "  Mantas Kriaučiūnas https://launchpad.net/~mantas\n"
 "  Moo https://launchpad.net/~mooo\n"
-"  Rytis Ūsalis https://launchpad.net/~rytis-usalis\n"
+"  Rytis Usalis 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.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Įrašyti dokumentą prieš baigiant programos darbą?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Baigti neįrašant"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Atrodo, kad turite Brother skenerį."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Tvarkyklės šiam įrenginiui yra prieinamos <a "
-"href=\"http://support.brother.com\">Brother svetainėje</a>."
+"Tvarkyklės šiam įrenginiui yra prieinamos <a href=\"http://support.brother."
+"com\">Brother svetainėje</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Atrodo, kad turite Samsung skenerį."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Tvarkyklės šiam įrenginiui yra prieinamos <a "
-"href=\"http://samsung.com/support\">Samsung svetainėje</a>."
+"Tvarkyklės šiam įrenginiui yra prieinamos <a href=\"http://samsung.com/"
+"support\">Samsung svetainėje</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Atrodo, kad turite HP skenerį."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Atrodo, kad turite Epson skenerį."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Tvarkyklės šiam įrenginiui yra prieinamos <a "
-"href=\"http://support.epson.com\">Epson svetainėje</a>."
+"Tvarkyklės šiam įrenginiui yra prieinamos <a href=\"http://support.epson.com"
+"\">Epson svetainėje</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Įdiegti tvarkykles"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Įdiegę, turėsite iš naujo paleisti Paprastą skenavimą."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Įdiegiamos tvarkyklės..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Įdiegiamos tvarkyklės…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Tvarkyklės sėkmingai įdiegtos!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Nepavyko įdiegti tvarkyklių (klaidos kodas %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Nepavyko įdiegti tvarkyklių."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Jums reikia įdiegti %s paketą(-us)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Jums reikia įdiegti %s paketą."
+msgstr[1] "Jums reikia įdiegti %s paketus."
+msgstr[2] "Jums reikia įdiegti %s paketus."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Nuostatos"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d tašk./col. (numatytoji)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Klaviatūros trumpiniai"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d tašk./col. (juodraštis)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Žinynas"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d tašk./col. (didelė raiška)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Apie"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Baigti"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "El. paštu"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Pradėti iš naujo…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Pasukti puslapį kairėn (prieš laikrodžio rodyklę)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Pasukti puslapį dešinėn (pagal laikrodžio rodyklę)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Apkirpti pažymėtą puslapį"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Ištrinti pasirinktą puslapį"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Atsisakyti"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Į_galioti"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Ištekliaus na_udotojo vardas:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "Sla_ptažodis:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d tašk./col."
+msgid "Unable to encode page %i"
+msgstr "Nepavyko užkoduoti puslapio %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skenuojama"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skenuoti vieną puslapį"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skenuoti visus puslapius iš dokumento dėklo"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skenuoti nenutrūkstamai nuo skenavimo plokštumos"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stabdyti skenavimą"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentų pakeitimas"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Perkelti puslapį kairėn"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Perkelti puslapį dešinėn"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Pasukti puslapį kairėn (prieš laikrodžio rodyklę)"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Naujas dokumentas"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Pasukti puslapį dešinėn (pagal laikrodžio rodyklę)"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokumentas"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Ištrinti puslapį"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "El. paštas..."
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumento valdymas"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Spausdinti..."
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Pradėti naują dokumentą"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Žinynas"
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Įrašyti nuskenuotą dokumentą"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Apie"
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Siųsti nuskenuotą dokumentą el. paštu"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Baigti"
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Spausdinti nuskenuotą dokumentą"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopijuoti nuskenuotą dokumentą į iškarpinę"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skeneris"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Keisti _skenerį"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skenuoti puses"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "Į_diegti tvarkykles"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Puslapio dydis"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Priekinė pusė"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Galinė pusė"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Abi"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Delsa"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "Multiple page from flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Daug puslapių nuo plokštumos"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekundžių"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skenuojama"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Teksto raiška"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Nuotraukos raiška"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Šviesumas"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrastas"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kokybė"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Tamsesnis"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Šviesesnis"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Mažiau"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Daugiau"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Žemiausia"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d tašk./col. (numatytoji)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Aukščiausia"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d tašk./col. (juodraštis)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Įrašomas dokumentas..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d tašk./col. (didelė raiška)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Įrašomas puslapis %d iš %d"
+msgid "%d dpi"
+msgstr "%d tašk./col."
 
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Skaitytuvo kryptis per skaitomą puslapį."
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nėra prieinamų skenerių. Prašome prijungti skenerį."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nepavyko prisijungti prie skenerio"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nepavyko pradėti skenavimo"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Klaida susisiekiant su skeneriu"
 
-#~ msgid "Contrast of scan"
-#~ msgstr "Nuskenuoto dokumento kontrastas"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Rodyti laidos versiją"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Skaisčio derinimas nuo -100 iki 100 (0 nėra)."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Išvesti derinimo pranešimus"
 
-#~ msgid "Brightness of scan"
-#~ msgstr "Nuskenuoto dokumento skaistis"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Pataisyti PDF failus sukurtus su senesnėmis „Paprasto skenavimo“ versijomis"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kokybės reikšmė JPEG glaudinimui"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skenavimas nepavyko"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Skenuojamo dokumento tipas. Šis nustatymas apsprendžia skaitymo raišką, "
-#~ "spalvas ir baigiamąjį apdorojimą."
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Vykdomas skenavimas"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Skenuojamo dokumento tipas"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ĮRENGINYS...] - Skenavimo įraknis"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+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“."
 
-#~ msgid "Device to scan from"
-#~ msgstr "Skenavimo įrenginys"
+#~ msgid "Front and Back"
+#~ msgstr "Abi pusės"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Teksto skenavimo raiška"
+#~ msgid "New"
+#~ msgstr "Naujas"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Nuotraukų skenavimo raiška"
+#~ msgid "Rotate Left"
+#~ msgstr "Pasukti kairėn"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Raiška taškais colyje skenuojant tekstą."
+#~ msgid "Rotate Right"
+#~ msgstr "Pasukti dešinėn"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Raiška taškais colyje skenuojant nuotraukas."
+#~ msgid "Crop"
+#~ msgstr "Apkirpti"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Skenuojama puslapio pusė"
+#~ msgid "Scan S_ource:"
+#~ msgstr "Skenavimo š_altinis:"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Puslapio pusė, kurią skenuoti."
+#~ msgid "New Document"
+#~ msgstr "Naujas dokumentas"
 
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Popieriaus aukštis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
-#~ "popieriaus aptikimui)."
+#~ msgid "Document"
+#~ msgstr "Dokumentas"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Popieriaus aukštis dešimtosiomis milimetro dalimis"
+#~ msgid "Email..."
+#~ msgstr "El. paštas..."
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Popieriaus plotis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
-#~ "popieriaus aptikimui)."
+#~ msgid "Print..."
+#~ msgstr "Spausdinti..."
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE įrenginys, iš kurio gauti paveikslus."
+#~ msgid "_Install Drivers"
+#~ msgstr "Į_diegti tvarkykles"
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Popieriaus plotis dešimtosiomis milimetro dalimis"
+#~ msgid "Minimum"
+#~ msgstr "Žemiausia"
 
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrasto reguliavimas nuo -100 iki 100 (0 nėra)."
+#~ msgid "Maximum"
+#~ msgstr "Aukščiausia"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Katalogas failams įrašyti. Jei nenustatyta, numatytoji reikšmė yra dokumentų "
-#~ "katalogas."
+#~ msgid "Saving document..."
+#~ msgstr "Įrašomas dokumentas..."
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Katalogas, į kurį įrašyti failus"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Įrašomas puslapis %d iš %d"
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kokybės reikšmė, naudojama JPEG glaudinimui."
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Skaitytuvo kryptis per skaitomą puslapį."
diff --git a/po/lv.gmo b/po/lv.gmo
deleted file mode 100644
index 109c570..0000000
--- a/po/lv.gmo
+++ /dev/null
diff --git a/po/lv.po b/po/lv.po
index 3ddfb24..e5c4659 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,513 +1,533 @@
 # 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.
 #
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-"
+"scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-28 16:43+0200\n"
+"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :"
+" 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizēties"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Ierīce, no kuras skenēt"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Res_ursa lietotājvārds:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE ierīce, no kuras iegūt attēlus."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Parole:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Skenējamā dokumenta veids"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+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."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Priekšpuse un aizmugure"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Papīra platums mm desmitdaļās"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Priekšpuse"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Aizmugure"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papīra garums mm desmitdaļās"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+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:35
+msgid "Brightness of scan"
+msgstr "Skenējuma gaišums"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Gaišuma pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Skenējuma kontrasts"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrasta pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Teksta skenējumu izšķirtspēja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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:50
+msgid "Resolution for photo scans"
+msgstr "Fotogrāfiju skenējumu izšķirtspēja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Skenējamā lapas puse"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Skenējamās lapas puse."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Direktorija, kurā saglabāt datnes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Aizture milisekundēs starp lappusēm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Aizture milisekundēs starp lappusēm."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 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:241
-msgid "_Document"
-msgstr "_Dokuments"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenēt dokumentus"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_enēt"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Ļoti vienkāršs veids, kā skenēt dokumentus un fotogrāfijas. Jūs varat"
+" izgriezt ārā sliktās fotogrāfijas daļas un tās pagriezt, ja tās ir nepareizā"
+" virzienā. Varat izdrukāt ieskanētos dokumentus, eksportēt tos pdf formātā"
+" vai saglabāt tos dažādos attēlu formātos."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Vienkāršā skenēšana izmanto SANE ietvaru, kas atbalsta vairumu esošo skeneru."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentu skenētājs"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skenēt;skeneris;plakanvirsma;adf;"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Viena la_pa"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Visas lapas no _padeves"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Apturēt _skenēšanu"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Vairākas lappuses no plakanvirsmas"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Teksts"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokuments"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_enēt"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Apturēt _skenēšanu"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Pārkārtot lapas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-pasts"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "La_pa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Pagriezt pa _kreisi"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Pag_riezt pa labi"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
-msgstr "Ap_cirst"
+msgstr "_Kadrēt"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Bez"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
-msgstr "_Letter"
+msgstr "_Vēstules forma"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr "Le_gal"
+msgstr "Le_gāls"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Pielāgots"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
-msgstr "Pag_riezt apciršanu"
+msgstr "Pag_riezt kadrējumu"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Pārvietot pa kreisi"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Pārvietot pa labi"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Palīdzība"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Saturs"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Sākt jaunu dokumentu"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Jauns"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Ieskenēt vienu lapu no skenera"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skenēt"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Saglabāt"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Apturēt pašreizējo skenēšanu"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Apturēt"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-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:750
-msgid "Rotate Left"
-msgstr "Pagriezt pa kreisi"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Meklē skenerus…"
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-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:765
-msgid "Rotate Right"
-msgstr "Pagriezt pa labi"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Apcirst izvēlēto lapu"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Apcirst"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Iestatījumi"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Skenēšanas av_ots:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Teksta izšķirtspēja:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Fotogrāfijas izšķirts_pēja:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skenējamā puse:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Lapas izmērs:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Gaišums:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrasts:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalitāte:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skenēt dokumentus"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Aizvērt"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Lai piekļūtu “%s”, ir vajadzīgs lietotājvārds un parole"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Gatavs skenēt"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Nepieciešama papildu programmatūra"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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:871
-msgid "Unable to connect to scanner"
-msgstr "Neizdevās savienoties ar skeneri"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Neizdevās sākt skenēšanu"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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:391
-msgid "Failed to scan"
-msgstr "Neizdevās skenēt"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-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:632
-#, 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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Aizvērt"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Lai piekļūtu “%s”, ir vajadzīgs lietotājvārds un parole"
+"Vajadzēs <a href=\"install-firmware\">uzinstalēt draiveri</a> šim skenerim."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nav atrasts neviens skeneris"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lūdzu, pārbaudiet, vai skeneris ir pievienots un ieslēgts"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Saglabāt kā..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Saglabāt kā…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Saglabāt"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Ieskenēts Dokuments.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Attēlu datnes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Visas datnes"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (vairāku lapu dokuments)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (saspiests)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (bez zudumiem)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (saspiests)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Datnes formāts:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Saspiešana:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Datne ar nosaukumu “%s” jau eksistē. Vai jūs vēlaties to aizstāt?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Aizstāt"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Saglabā"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Saglabāt šo dokumentu?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Izmest izmaiņas"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Sazinās ar skeneri…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Neizdevās atvērt attēlu priekšskatīšanas lietotni"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
-msgstr ""
+msgstr "Apvienot puses"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Apvienot puses (apgriezti)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Pagriezt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Paturēt nemainīti"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Nevar atvērt palīdzības datni"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -533,16 +553,16 @@ msgstr ""
 "nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Par Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Vienkāršs dokumentu skenēšanas rīks"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -552,199 +572,541 @@ msgstr ""
 "  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Pirms iziešanas saglabāt dokumentu?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Izskatās, ka jums ir Brother skeneris."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"Tam draiveri ir pieejami <a href=\"http://support.brother.com\">Brother"
+" tīmekļa vietnē</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Izskatās, ka jums ir Samsung skeneris."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"Tam draiveri ir pieejami <a href=\"http://samsung.com/support\">Samsung"
+" tīmekļa vietnē</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Izskatās, ka jums ir HP skeneris."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Izskatās, ka jums ir Epson skeneris."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
+"Tam draiveri ir pieejami <a href=\"http://support.epson.com\">Epson tīmekļa"
+" vietnē</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Instalēt draiverus"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Kad tie ir instalēti, jums vajadzēs pārstartēt “Vienkāršo skenēšanu”."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Instalē draiverus…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Draiveri ir veiksmīgi uzinstalēti!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Neizdevās uzinstalēt draiverus (kļūdas kods %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Neizdevās uzinstalēt draiverus."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Jums jāuzinstalē %s pakotne."
+msgstr[1] "Jums jāuzinstalē %s pakotnes."
+msgstr[2] "Jums jāuzinstalē %s pakotņu."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Iestatījumi"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tastatūras saīsnes"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Palīdzība"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Par"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Iziet"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "E-pasts"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Startēt atkal…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Pagriezt lapu pa kreisi (pretēji pulksteņa rādītāja virzienam)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Kadrēt izvēlēto lapu"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Dzēst izvēlēto lapu"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizēties"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Res_ursa lietotājvārds:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Parole:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Nevar iekodēt lapu %i"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skenēšana"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Ieskenēt vienu lapu"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Ieskenēt visas lapas no dokumentu padevēja"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Ieskenēt nepārtraukti no plakanvirsmas skenera"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Apturēt skenēšanu"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumenta modifikācijas"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pārvietot lapu pa kreisi"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pārvietot lapu pa labi"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Pagriezt lapu pa kreisi (pretēji pulksteņa rādītāja virzienam)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Dzēst lapu"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumentu pārvaldība"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Sākt jaunu dokumentu"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Saglabāt skenēto dokumentu"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Sūtīt skenēto dokumentu pa e-pastu"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Drukāt skenēto dokumentu"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopēt šo lapu uz starpliktuvi"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Skeneris"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Skenēt puses"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Lapas izmērs"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Priekšpuse"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Aizmugure"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Abas"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Aizture"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Vairākas lappuses no plakanvirsmas"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekundes"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Skenēšana"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Teksta izšķirtspēja"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "Fotogrāfijas izšķirts_pēja"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Gaišums"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Kontrasts"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Kvalitāte"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automātiski"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tumšāks"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Gaišāks"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Mazāk"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Vairāk"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (noklusējuma)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Jauns dokuments"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Skeneris nav atrasts. Lūdzu, pievienojiet skeneri."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokuments"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Neizdevās savienoties ar skeneri"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Epasts..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Neizdevās sākt skenēšanu"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Drukāt..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Kļūda, sazinoties ar skeneri"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Palīdzība"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Rādīt laidiena versiju"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Par"
+#. 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/ui.vala:1855
-msgid "Quit"
-msgstr "Iziet"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Mainīt _skeneri"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Neizdevās skenēt"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Notiek skenēšana"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[IERĪCE…] — skenēšanas utilītprogramma"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+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."
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automātiski"
+#~ msgid "Front and Back"
+#~ msgstr "Priekšpuse un aizmugure"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Tumšāks"
+#~ msgid "New"
+#~ msgstr "Jauns"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Gaišāks"
+#~ msgid "Rotate Left"
+#~ msgstr "Pagriezt pa kreisi"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Mazāk"
+#~ msgid "Rotate Right"
+#~ msgstr "Pagriezt pa labi"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Vairāk"
+#~ msgid "Crop"
+#~ msgstr "Apcirst"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimums"
+#~ msgid "Scan S_ource:"
+#~ msgstr "Skenēšanas av_ots:"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksimums"
+#~ msgid "New Document"
+#~ msgstr "Jauns dokuments"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Saglabā dokumentu..."
+#~ msgid "Document"
+#~ msgstr "Dokuments"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Saglabā lapu %d no %d"
+#~ msgid "Email..."
+#~ msgstr "Epasts..."
+
+#~ msgid "Print..."
+#~ msgstr "Drukāt..."
+
+#~ msgid "Minimum"
+#~ msgstr "Minimums"
+
+#~ msgid "Maximum"
+#~ msgstr "Maksimums"
+
+#~ msgid "Saving document..."
+#~ msgstr "Saglabā dokumentu..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Saglabā lapu %d no %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Ierīce, no kuras skenēt"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Skenēšanas virziens"
 
@@ -752,8 +1114,8 @@ msgstr "Saglabā lapu %d no %d"
 #~ msgstr "Skenētā attēla augstums pikseļos"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
@@ -770,15 +1132,6 @@ msgstr "Saglabā lapu %d no %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Lūdzu, pārbaudiet instalāciju"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE ierīce, no kuras iegūt attēlus."
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Fotogrāfiju skenējumu izšķirtspēja"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Teksta skenējumu izšķirtspēja"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Pēdējā skenētā attēla izšķirtspēja"
 
@@ -789,88 +1142,17 @@ msgstr "Saglabā lapu %d no %d"
 #~ "Skenētā attēla augstums pikseļos. Šī vērtība tiek atjaunināta, ņemot vērā "
 #~ "pēdējo skenēto lapu."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Izšķirtspēja punktos/collā, skenējot fotogrāfijas."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Izšķirtspēja punktos/collā, skenējot tekstu."
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Iepriekšēji skenētā attēla izšķirtspēja punktos/collā."
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skenēts dokuments"
-
-#~ 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)."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Skenējamā lapas puse"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Papīra garums mm desmitdaļās"
-
-#~ 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)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Papīra platums mm desmitdaļās"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Skenējamās lapas puse."
-
-#~ 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."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skenera virziens pāri skenējamai lapai."
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "PATIESS, ja lietotnes logs ir maksimizēts"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Skenējamā dokumenta veids"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Direktorija, kurā saglabāt datnes"
-
-#~ 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ā."
-
 #~ msgid "Select File _Type"
 #~ msgstr "Norādīt datnes _tipu"
 
 #~ msgid "Files missing"
 #~ msgstr "Pietrūkst datņu"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrasta pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Skenējuma kontrasts"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Gaišuma pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Skenējuma gaišums"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai"
diff --git a/po/meson.build b/po/meson.build
new file mode 100644
index 0000000..6a0dcc9
--- /dev/null
+++ b/po/meson.build
@@ -0,0 +1,3 @@
+i18n.gettext ('simple-scan', preset: 'glib')
+
+podir = meson.current_source_dir ()
diff --git a/po/mhr.gmo b/po/mhr.gmo
deleted file mode 100644
index 8b09f4c..0000000
--- a/po/mhr.gmo
+++ /dev/null
diff --git a/po/mhr.po b/po/mhr.po
index d54be43..3e2df46 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: mhr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Шолыпмут:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Шрифт"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr ""
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "Ик _лаштык"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Фотосӱрет"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Лаштык"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Лектыш"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Иктат"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Серыш"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Йӱла"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Шола"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Пурла"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Полышык"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Содержаний"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "У"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Аныклаш"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Шогалташ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Лектыш"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Келыштарымаш-влак"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Лаштыкын кугыт"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Ыштыш-кучыш:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -539,189 +564,189 @@ msgstr ""
 "  Снежана https://launchpad.net/~snezhana-yandemerova-94"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Пычкемышрак"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ms.gmo b/po/ms.gmo
deleted file mode 100644
index 3738c88..0000000
--- a/po/ms.gmo
+++ /dev/null
diff --git a/po/ms.po b/po/ms.po
index f815b05..231a6c5 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Benarkan"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nama pengguna untuk sumber:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Kata Laluan:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Hadapan dan Belakang"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Hadapan"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Ke belakang"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Pengimbas Ringkas"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Dokumen"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "I_mbas"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "_Halaman Tunggal"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Semua Halaman Dari _Suapan"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "_Henti Imbas"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Teks"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Tertib Semula Halaman"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Emel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Putar Ke Ki_ri"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Putar Ke Ka_nan"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Tiada"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Tersendiri"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Putar & Kerat"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Alih Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "ALih Ke Kanan"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Bantuan"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Kandungan"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Mulakan dokumen baru"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Baru"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "Imbas halaman tunggal dari pengimbas"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Imbas"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Simpan dokumen ke fail"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Simpan"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Hentikan Imbasan semasa"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Henti"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Putar halaman ke kiri (lawan-jam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Putar Ke Kiri"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Putar halaman ke kanan (arah-jam)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Putar Ke Kanan"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Kerat halaman pilihan"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Kerat"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Keutamaan"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Imbas Su_mber:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Imbas Sisi:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Saiz Halaman:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Beza Jelas:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Kualiti:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Pengimbas dokumen"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Imbas Dokumen"
 
@@ -308,7 +322,7 @@ msgstr "imbs;pengimbas;rata;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -320,7 +334,7 @@ msgstr ""
 "kedudukan yang salah. Anda boleh cetak imbasan anda, eksport ia ke pdf, atau "
 "simpan ia dengan sejumlah besar format imej."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,192 +342,203 @@ msgstr ""
 "pengimbas sedia ada."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Tiada pengimbas hadir. Sila sambungkan pengimbas."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Tidak boleh menyambung kepada pengimbas"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Tidak boleh memulakan imbasan"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Ralat berkomunikasi dengan pengimbas"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: 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
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Papar mesej penyahpepijatan"
 
-#: ../src/simple-scan.vala:26
+#: 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 Pengimbas Ringkas"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Gagal mengimbas"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utiliti mengimbas"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 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."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "_Tutup"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nama pengguna dan kata laluan diperlukan untuk mencapai '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Tiada pengimbas dikesan"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Sila semak pengimbas anda sama ada ia bersambung dan dihidupkan"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr "Perisian tambahan diperlukan"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr "Anda perlu pasang perisian pemacu untuk pengimbas anda."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Simpan"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Diimbas.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Fail Imej"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Semua Fail"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen berbilang-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (termampat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (tidak hilang)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "Format fail:"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "Gagal menyimpan fail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jika anda tidak simpan, semua perubahan akan hilang."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "Simpan dokumen semasa"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Abai Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "Tidak boleh menyimpan imej untuk pratonton"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Tidak boleh membuka aplikasi partonton imej"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "Gabung sisi"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "Gabung sisi (songsang)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Songsang"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Kekal tidak berubah"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Tidak boleh membuka fail bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -542,16 +567,16 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Alat mengimbas dokumen mudah"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -563,22 +588,22 @@ msgstr ""
 "  dequan https://launchpad.net/~dequan"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Keluar tanpa Menyimpan"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr "Anda kelihatan mempunyai pengimbas Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -587,12 +612,12 @@ msgstr ""
 "Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr "Anda kelihatan mempunyai pengimbas Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -601,17 +626,17 @@ msgstr ""
 "Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr "Anda kelihatan mempunyai pengimbas HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr "Anda kelihatan mempunyai pengimbas Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -620,138 +645,138 @@ msgstr ""
 "sesawang Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "Pasang pemacu"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Setelah dipasang anda perlu mulakan semula Pengimbas Ringkas."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "Memasng pemacu..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "Pemacu berjaya dipasangkan!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Gagal memasang pemacu (kod ralat %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr "Gagal memasang pemacu."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Anda perlu pasang pakej(s) %s."
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (tersedia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (resolusi tinggi)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Dokumen Baharu"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Emel..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Keluar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Ubah _Pengimbas"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "_Pasang Pemacu"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Lebih Cerah"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Lagi"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d daripada %d"
diff --git a/po/my.gmo b/po/my.gmo
deleted file mode 100644
index 1b01392..0000000
--- a/po/my.gmo
+++ /dev/null
diff --git a/po/my.po b/po/my.po
index 97d2db1..f59d888 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: my\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_A ခွင့်ပြုခြင်း"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Username for resource:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Pစကားဝှက်"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "အရှေ့နှင့်အနောက်"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "အရှေ့"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "နောက်သို့"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "ရိုးရိုး Scan ဖတ်ခြင်း"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Dစာရွက်စာတမ်း"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Sc_an"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "_P ရိုးရိုး Scan ဖတ်ခြင်း"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "_F Feeder မှ စာမျက်နှာအားလုံး"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "_S Scan ရပ်မည်။"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "စာ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "ဓာတ်ပုံ"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Eအီးမေး"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Pစာမျက်နှာ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "_L ဘယ်ဖက်လှည့်ပါ။"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "_R ညာဖက်သို့လှည့်မည်။"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_C ဖြတ်ပါ။"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Nဘာမှမဟုတ်"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_L စာ"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "ဘယ်ဖက်သို့ရွှေ့ပါ။"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "ညာဖက်သို့ရွှေ့ပါ။"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_H အကူအညီ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_  C ခေါင်းစဉ်"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "အသစ်စတင်ရန်"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "အသစ်"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "Scanner ထဲမှ စာမျက်နှာ တစ်ရွက်တည်းကို Scan ဖတ်မည်။"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "သိမ်းဆည်းပါ"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "ယခု Scan ဖတ်နေခြင်းကိုရပ်မည်။"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "ရပ်မည်"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "စာမျက်နှာကို ဘယ်ဖက်သို့လှည့်ပါ။(နာရီလက်တံပြောင်းပြန်)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "ဘယ်ဖက် လှည့်ပါ။"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "စာမျက်နှာကို ညာဖက်သို့လှည့်ပါ။ (နာရီလက်တံ)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "ညာဖက်လှည့်ပါ။"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "ရွေးချယ်ထားသောစာမျက်နှာကို ဖြတ်ပါ။"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "ဖြတ်ပါ။"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Pဓာတ်ပုံ resolution-"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "စာရွက်အရွယ်အစား"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,198 +330,209 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Scanner နှင့်ချိတ်ဆက်ထားခြင်းမရှိပါ။ Scanner နှင့်ချိတ်ဆက်ပါ။"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Scanner နှင့်မချိတ်ဆက်နိုင်ပါ။"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Scan မစတင်နိုင်ပါ။"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Scanner နှင့်ချိတ်ဆက်ရင်းအမှားအယွင်းဖြစ်ခဲ့သည်။"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "ထုတ်လုပ်သော ဗားရှင်းကို ပြပါ"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Debugging messages ကိုစာရွက်ထုတ်မည်။"
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Scan မဖတ်ဖြစ်ပါ။"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "အမိန့်ပေး စာရင်း အပြည့်အစုံမြင်ရရန်  '%s--help' ဖြင့် ခိုင်းပါ"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ကိုသုံးရန်အတွက်သုံးစွဲသူအမည်နှင့် စကားဝှက်လိုအပ်ပါသည်။"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Scanner ရှာမတွေ့ပါ။"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "သင်၏ Scanner ကိုချိတ်ဆက်ပြီးကြောင်း၊ "
 "ပါဝါဖွင့်ထားကြောင်းသေချာအောင်ပြန်လည်စစ်ဆေးပါ။"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "ဖိုင်အလုံးစုံ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "ဖိုင်ကိုမသိမ်းဖြစ်ပါ။"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "ယခုစာရွက်စာတမ်းကိုသိမ်းမလား။"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "ကြည့်ရူရန်အတွက် ပုံများကိုမသိမ်းနိုင်ပါ။"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "အကူအညီဖိုင်ကို မဖွင့်နိုင်ပါ။"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -536,16 +561,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "ရိုးရှင်းစွာ Scan ဖတ်ခြင်းအကြောင်း"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -553,189 +578,189 @@ msgstr ""
 "  Pyae Sone https://launchpad.net/~gipsyhnh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "မပိတ်ခင် စာရွက်စာတမ်းများကိုသိမ်းမလား။"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "အလိုအလျှောက်"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
deleted file mode 100644
index cbca9da..0000000
--- a/po/nb.gmo
+++ /dev/null
diff --git a/po/nb.po b/po/nb.po
index b53d63a..ca9419f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,517 +1,522 @@
 # Norwegian Bokmal 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.
+# Kjetil Birkeland Moe <kjetil@skifremme.no>, 2009.
+# Kjartan Maraas <kmaraas@gnome.org>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2014-09-02 16:41+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-07-29 16:18+0000\n"
+"PO-Revision-Date: 2017-08-02 09:54+0200\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoriser"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Enhet det skal skannes fra"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Brukernavn for ressurs:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-enhet som bilder skal hentes fra."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Passord:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Dokumenttype som skannes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Dokumenttype som skal scannes. Denne innstillingen endrer oppløsning, farger "
+"og etterbehandling."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "For- og bakside"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Papirbredde i tiendels millimeter"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Forside"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Bakside"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papirhøyde i tiendels millimeter"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+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/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Skanningens ysstyrke"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+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:40
+msgid "Contrast of scan"
+msgstr "Skanningens kontrastforsterkning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+"Justering av kontrast fra -100 til 100 (en verdi på 0 gir ingen "
+"forsterkning)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Oppløsning for tekstskanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Oppløsning for bildeskanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Side som skal skannes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Siden som skal scannes."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Lagre filer i mappe"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr ""
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skann dokumenter"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_ann"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"En enkel måte å skanne dokumenter og bilder på. Du kan skjære bort uønskede "
+"deler og rotere bilder hvis de skannes inn feil vei. Skannede elementer kan "
+"skrives ut, eksporteres i pdf-format og lagres i ulike bildeformater."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan bruker rammeverket SANE til å støtte de vanligste skannerne."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentskanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skan;skanner;plan;adf;"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Enkel _side"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra papirmater"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stopp skanning"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Bilde"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_ann"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stopp skanning"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Omplasser sider"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Beskjær"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Roter beskjæringsområdet"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Flytt til venstre"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Flytt til høyre"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Innhold"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Begynn et nytt dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Ny"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Skann én enkel side fra skanneren"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skann"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Lagre"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stopp"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Roter siden til venstre (mot urviseren)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Roter mot venstre"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Roter siden til høyre (med urviseren)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Roter mot høyre"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Beskjær valgt side"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Beskjær"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Innstillinger"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Hent fra:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Tekstoppløsning"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Bildeoppløsning:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skann side:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sidestørrelse:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Lysstyrke:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalitet:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentskanner"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Søker etter skannere …"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skann dokumenter"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Lukk"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skan;skanner;plan;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Behøver brukernavn og passord for å få tilgang til «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Klar til å skanne"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"En enkel måte å skanne dokumenter og bilder på. Du kan skjære bort uønskede "
-"deler og rotere bilder hvis de skannes inn feil vei. Skannede elementer kan "
-"skrives ut, eksporteres i pdf-format og lagres i ulike bildeformater."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Tilleggsprogram må installeres"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan bruker rammeverket SANE til å støtte de vanligste skannerne."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Ingen skanner tilgjengelig. Koble til en skanner."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Klarte ikke å koble til skanneren"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Klarte ikke å sette i gang skanneren"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Klarte ikke å utføre skanningen"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ENHET...] - Scanneutstyr"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Kjør «%s --help» for å se en full liste over tilgjengelige kommandolinjevalg."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Lukk"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr "Du må <a href=\"install-firmware\">installere driverprogramvare for din skanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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å"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Tilleggsprogram må installeres"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Du må installere en driver for denne skanneren."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Lagre som..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Lagre som …"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Lagre"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alle Filer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimert)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Filformat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimering:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "En fil med navnet «%s» eksisterer allerede. Vil du erstatte den?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "E_rstatt"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Lagrer"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Hvis du ikke lagrer vil endringene gå tapt."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Hvis du ikke lagrer vil endringene gå tapt for alltid."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontakter _skanner …"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Klarte ikke å lagre forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombiner sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombiner sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Behold uendret"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Klarte ikke å åpne hjelpefil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -540,419 +545,483 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Allan Nordhøy https://launchpad.net/~comradekingu\n"
 "  Hans Rødtang https://launchpad.net/~hansrodtang\n"
 "  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\n"
-"  kingu https://launchpad.net/~comradekingu\n"
 "  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Det ser ut som at du har en Brother-skanner."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Du skal kunne finne drivere på <a "
-"href=\"http://support.brother.com\">Brothers nettsider</a>."
+"Du skal kunne finne drivere på <a href=\"http://support.brother.com"
+"\">Brothers nettsider</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Det ser ut som at du har en Samsung-skanner."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Du skal kunne finne drivere på <a "
-"href=\"http://samsung.com/support\">Samsungs nettsider</a>."
+"Du skal kunne finne drivere på <a href=\"http://samsung.com/support"
+"\">Samsungs nettsider</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Det ser ut som at du har en HP-skanner."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Det ser ut som at du har en Epson-skanner."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Drivere er tilgjengelig på <a href=\"http://support.epson.com\">Epson</a>s "
 "nettside."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Installer drivere"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Start Simple Scan på nytt når driveren er installert."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Installerer drivere …"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Driverne er nå installert."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Klarte ikke å installere drivere (feilkode %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Klarte ikke å installere drivere."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Du må installere pakka/pakkene for %s."
-
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (standard)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (kladd)"
-
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (høy oppløsning)"
-
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nytt dokument"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-post …"
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Du må installere %s-pakken."
+msgstr[1] "Du må installere %s-pakkene."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Innstillinger"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Skriv ut …"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tastatursnarveier"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
 msgstr "Avslutt"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Bytt _skanner"
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-post"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installer drivere"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Start igjen …"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatisk"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Roter siden til venstre (mot urviseren)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Mørkere"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Roter siden til høyre (med urviseren)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Lysere"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Beskjær valgt side"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Mindre"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Slett valgt side"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Mer"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "A_vbryt"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autoriser"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksimum"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Brukernavn for ressurs:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Lagrer dokument …"
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Passord:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Lagrer side nr. %d av %d"
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
-
-#~ msgid "Files missing"
-#~ msgstr "Manglende filer"
+msgid "Unable to encode page %i"
+msgstr "Klarte ikke å kode side %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skanner"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skann en enkelt side"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skann alle sider fra dokumentmateren"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr ""
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Høyde på skannede bilder, i pixler"
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stopp pågående skanning"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentendring"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Flytt side til venstre"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Flytt side til høyre"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Roter side til venstre (mot urviseren)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Roter side til høyre (med urviseren)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Slett side"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumenthåndtering"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Lag et nytt dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Lagre skannet dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Send skannet dokument med e-post"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Skriv ut skannet dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopier denne siden til utklippstavlen"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Oppløsning for bildeskanning"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skanner"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Oppløsning for tekstskanning"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skann sider"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Enhet det skal skannes fra"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Sidestørrelse"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-enhet som bilder skal hentes fra."
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Forside"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Skanneretning"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Bakside"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Oppløsning på sist skannede bilde"
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Begge"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Lagre filer i mappe"
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Pause"
 
-#~ 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'"
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple page from flatbed"
+msgstr ""
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Dokumenttype som skannes"
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunder"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skanning"
 
-#~ 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."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Tekstoppløsning"
 
-#~ 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."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Bildeoppløsning"
 
-#~ 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."
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Lysstyrke"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "SANN hvis programvinduet er maksimert"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalitet"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatisk"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Mørkere"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lysere"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Vindushøyde i pixler"
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Mindre"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Vindusbredde i pixler"
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Mer"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Bredde på skannet bilde, i pixler"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (standard)"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skannet dokument"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (kladd)"
 
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
 #, 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+"
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (høy oppløsning)"
 
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Bruk:\n"
-#~ "  %s [ENHET...] - Skanneutstyr"
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Ingen skanner tilgjengelig. Koble til en skanner."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Klarte ikke å koble til skanneren"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Klarte ikke å sette i gang skanneren"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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.vala:392
+msgid "Failed to scan"
+msgstr "Klarte ikke å utføre skanningen"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Skanning pågår"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ENHET …] – Scanneutstyr"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, 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 "Select File _Type"
-#~ msgstr "Velg fil_type"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Vennligst undersøk installasjonen"
-
-#~ 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'"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Side som skal skannes"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Papirhøyde i tiendels millimeter"
-
-#~ 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)."
-
-#~ 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)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Papirbredde i tiendels millimeter"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Siden som skal scannes."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Dokumenttype som skal scannes. Denne innstillingen endrer oppløsning, farger "
-#~ "og etterbehandling."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Retningen til scanneren over den scannede siden."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr ""
-#~ "Justering av kontrast fra -100 til 100 (en verdi på 0 gir ingen "
-#~ "forsterkning)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Skanningens kontrastforsterkning"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Justering av lysstyrke fra -100 til 100 (0 betyr ingen lys)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Skanningens ysstyrke"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Kjør «%s --help» for å se en full liste over tilgjengelige kommandolinjevalg."
diff --git a/po/ne.po b/po/ne.po
new file mode 100644
index 0000000..3c81f60
--- /dev/null
+++ b/po/ne.po
@@ -0,0 +1,1061 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Gnome Nepali Translation Project\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-07-18 08:20+0000\n"
+"PO-Revision-Date: 2017-07-28 11:56+0545\n"
+"Language-Team: Nepali Translation Team <chautari@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.3\n"
+"Last-Translator: Pawan Chitrakar <chautari@gmail.com>\n"
+"Language: ne\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+#, fuzzy
+msgid "Device to scan from"
+msgstr "यसबाट प्रत्यक्ष आगत घटना पढ्ने यन्त्र ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+#, fuzzy
+msgid "Type of document being scanned"
+msgstr "डक्युमेन्ट टाईप डेफिनेसन"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+#, fuzzy
+msgid "Width of paper in tenths of a mm"
+msgstr "कागजको चौडाइ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+#, fuzzy
+msgid "Height of paper in tenths of a mm"
+msgstr "कागजको उचाइ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+#, fuzzy
+msgid "Brightness of scan"
+msgstr "चम्लिकोपना"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+#, fuzzy
+msgid "Contrast of scan"
+msgstr "व्यतिरेक"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+#, fuzzy
+msgid "Resolution for text scans"
+msgstr "स्क्यान्सको आवश्यक सङ्ख्या"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+#, fuzzy
+msgid "Resolution for photo scans"
+msgstr "फोटो रिजोल्युसन"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+#, fuzzy
+msgid "Page side to scan"
+msgstr "स्क्यान"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+#, fuzzy
+msgid "The page side to scan."
+msgstr "पोर्ट स्क्यान"
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+#, fuzzy
+msgid "Directory to save files to"
+msgstr "युआई फाइलहरूको लागि डाटा निर्देशिका"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+#, fuzzy
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG सङ्कुचन गुण:"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+#, fuzzy
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG सङ्कुचन गुण:"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+#, fuzzy
+msgid "Delay in millisecond between pages"
+msgstr "फोटोहरूको बीचमा समय"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+#, fuzzy
+msgid "Delay in millisecond between pages."
+msgstr "फोटोहरूको बीचमा समय"
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
+#, fuzzy
+msgid "Simple Scan"
+msgstr "सरल"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+#, fuzzy
+msgid "Scan Documents"
+msgstr "स्क्यान"
+
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
+#: data/simple-scan.desktop.in:4
+#, fuzzy
+msgid "Document Scanner"
+msgstr "स्क्यानर"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+#, fuzzy
+msgid "Single _Page"
+msgstr "एकल"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+#, fuzzy
+msgid "All Pages From _Feeder"
+msgstr "सबैबाट सदस्यता हटाउनुहोस्"
+
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+#, fuzzy
+msgid "_Multiple Pages From Flatbed"
+msgstr "बहुविध पृष्ठहरू देखाउनुहोस्"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+msgid "Text"
+msgstr "पाट"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+msgid "Photo"
+msgstr "तस्वीर"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "कागजात"
+
+#. Scan menu item
+#: src/app-window.ui:110
+#, fuzzy
+msgid "Sc_an"
+msgstr "स्केल"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+#, fuzzy
+msgid "_Stop Scan"
+msgstr "स्क्यान"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+#, fuzzy
+msgid "Reorder Pages"
+msgstr "नोडहरू फेरि क्रमबद्ध गर्न तान्नुहोस्"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "इमेल"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "पृष्ठ"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "बायाँ घुमाउनुहोस्"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "दायाँ घुमाउनुहोस्"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "काटछाँट गर्नुहोस्"
+
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "केही छैन"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr ""
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr ""
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr ""
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+#, fuzzy
+msgid "_Letter"
+msgstr "लाइन खालीस्थान समायोजन गर्नुहोस्"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+#, fuzzy
+msgid "Le_gal"
+msgstr "ताई ले"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+#, fuzzy
+msgid "4×6"
+msgstr "६×६"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:397
+msgid "_Custom"
+msgstr "अनुकूलन गर्नुहोस्"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:415
+#, fuzzy
+msgid "_Rotate Crop"
+msgstr " ↶घुमाउनुहोस्:"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:428
+msgid "Move Left"
+msgstr "बाँया सार्नुहोस्"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:437
+msgid "Move Right"
+msgstr "दाँया सार्नुहोस्"
+
+#. Label on help menu
+#: src/app-window.ui:474
+msgid "_Help"
+msgstr "मद्दत गर्नुहोस्"
+
+#. Help|Contents menu
+#: src/app-window.ui:482
+msgid "_Contents"
+msgstr "सामग्री"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:520 src/app-window.ui:720
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: src/app-window.ui:522 src/app-window.ui:716
+msgid "Scan"
+msgstr "स्क्यान"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:538 src/app-window.ui:787
+msgid "Save document to a file"
+msgstr "फाइल बचत गर्नुहोस्"
+
+#: src/app-window.ui:540
+msgid "Save"
+msgstr "बचत गर्नुहोस्"
+
+#. Tooltip for stop button
+#: src/app-window.ui:555 src/app-window.ui:700
+#, fuzzy
+msgid "Stop the current scan"
+msgstr "स्क्यान"
+
+#: src/app-window.ui:556 src/app-window.ui:697
+msgid "Stop"
+msgstr "रोक्नुहोस्"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+#, fuzzy
+msgid "Searching for Scanners…"
+msgstr "खोज्दै छु ।"
+
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Close"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, fuzzy, c-format
+msgid "Username and password required to access “%s”"
+msgstr "“%s” जडान गर्न पासवर्ड चाहिने छ"
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#, fuzzy
+msgid "Ready to Scan"
+msgstr "तयार"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+#, fuzzy
+msgid "Additional software needed"
+msgstr "अतिरिक्त सफ्टवेयर स्थापना गर्ने ?"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:281
+#, fuzzy
+msgid "No scanners detected"
+msgstr "स्क्यानरका लागि उपलब्ध प्रोफाइलहरू"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:283
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "...यस रुपमा बचत गर्नुहोस्"
+
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+msgid "_Cancel"
+msgstr "_रद्द गर्नुहोस्"
+
+#: src/app-window.vala:302 src/app-window.vala:553
+msgid "_Save"
+msgstr "बचत गर्नुहोस्"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:310
+#, fuzzy
+msgid "Scanned Document.pdf"
+msgstr "यो उपकरण नयाँ सामग्रीको लागि स्क्यान गरिनेछ"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
+msgid "Image Files"
+msgstr "छवि फाइल"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:326
+msgid "All Files"
+msgstr "सबै फाइल"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:335
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:341
+#, fuzzy
+msgid "JPEG (compressed)"
+msgstr "JPEG"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:347
+#, fuzzy
+msgid "PNG (lossless)"
+msgstr "PNG + delta PNG"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#, fuzzy
+msgid "WebP (compressed)"
+msgstr "च्यापिएको साइज: "
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
+#, fuzzy
+msgid "File format:"
+msgstr "GZip संग सङ्कुचित फाइल ढाँचा SVG"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+#, fuzzy
+msgid "Compression:"
+msgstr "दवाब"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, fuzzy, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "फाइल नाम \"%s\" पहिल्यै अवस्थित छ। के तपाईँ यसलाई बदल्नु चाहनुहुन्छ ?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "प्रतिस्थापन गर्नुहोस्"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "फाइल बचत गर्दैछ..."
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:527
+#, fuzzy
+msgid "Failed to save file"
+msgstr "PPM फाइल '%s' बचत गर्न असफल भयो: %s"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:550
+#, fuzzy
+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/app-window.vala:591
+#, fuzzy
+msgid "Save current document?"
+msgstr "हालको कागजातको प्रतिलिपी बचत गर्नुहोस्"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:593
+msgid "Discard Changes"
+msgstr "परिवर्तनहरू छोड्नुहोस्"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+#, fuzzy
+msgid "Contacting scanner…"
+msgstr "स्क्यानर"
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:800
+#, fuzzy
+msgid "Unable to save image for preview"
+msgstr "_यस रूपमा छवि बचत गर्नुहोस्..."
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:812
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:990
+#, fuzzy
+msgid "Combine sides"
+msgstr "साइड:"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1000
+#, fuzzy
+msgid "Combine sides (reverse)"
+msgstr "साइड:"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1010
+msgid "Reverse"
+msgstr "उल्टाउनुहोस्"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1020
+#, fuzzy
+msgid "Keep unchanged"
+msgstr "पासवर्ड परिवर्तन गरिएको छैन"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1250
+msgid "Unable to open help file"
+msgstr "मद्दत फाइल खोल्न असक्षम भयो"
+
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1271
+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/app-window.vala:1274
+#, fuzzy
+msgid "About Simple Scan"
+msgstr "सरल"
+
+#. Description of program
+#: src/app-window.vala:1277
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: src/app-window.vala:1286
+msgid "translator-credits"
+msgstr "Pawan Chitrakar < chautari@gmail.com >"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1308
+#, fuzzy
+msgid "Save document before quitting?"
+msgstr "बन्द गर्नु अघि कागजात \"%s\" प्रतिलिपी बचत गर्नहुन्छ ?"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
+msgid "Quit without Saving"
+msgstr "बचत नगरी बन्द गर्नुहोस्"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1357
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1359
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+
+#. Message to indicate a Samsung scanner has been detected
+#: src/app-window.vala:1363
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1365
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+
+#. Message to indicate a HP scanner has been detected
+#: src/app-window.vala:1369
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1376
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+
+#. Title of dialog giving instructions on how to install drivers
+#: src/app-window.vala:1380
+msgid "Install drivers"
+msgstr "ड्राइभर स्थापना गर्नुहोस्"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1411
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "ड्राइभर स्थापना गर्नु…"
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1431
+msgid "Drivers installed successfully!"
+msgstr "ड्राइभर स्थापना सफल!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1441
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1447
+msgid "Failed to install drivers."
+msgstr "ड्राइभर स्थापन असफल"
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "प्राथमिकताहरू"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "कुञ्जीपाटी सर्टकटहरू"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "मद्दत"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "बारेमा"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "बन्द गर्नुहोस्"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "इमेल"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "फेरि सुरु गर्नुहोस्…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+#, fuzzy
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "९०° घडीसरह पृष्ठ घुमाउनुहोस्"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+#, fuzzy
+msgid "Rotate the page to the right (clockwise)"
+msgstr "९०° घडीसरह पृष्ठ घुमाउनुहोस्"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "छानिएको पृष्ठलाई काँटछाँट गर्नुहोस्"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#, fuzzy
+msgid "Delete the selected page"
+msgstr "चयन गरिएका सम्पर्कहरू मेट्नुहोस्"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "रद्द गर्ने"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "अधिकार दिनुहोस्"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+#, fuzzy
+msgid "_Username for resource:"
+msgstr "प्रयोगकर्ताको नाम:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_पासवर्ड:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr ""
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "स्क्यान गर्दै"
+
+#: src/help-overlay.ui:17
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "एकल"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr ""
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr ""
+
+#: src/help-overlay.ui:38
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "प्रगति"
+
+#: src/help-overlay.ui:46
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "परिमार्जन मितिद्वारा"
+
+#: src/help-overlay.ui:51
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "बाँया सार्नुहोस्"
+
+#: src/help-overlay.ui:58
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "दाँया सार्नुहोस्"
+
+#: src/help-overlay.ui:65
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "९०° घडीसरह पृष्ठ घुमाउनुहोस्"
+
+#: src/help-overlay.ui:72
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "९०° घडीसरह पृष्ठ घुमाउनुहोस्"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "पृष्ठ मेट्नुहोस्"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "कागजात प्रबन्ध"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "नयाँ कागजात सुरु गर्नुहोस्"
+
+#: src/help-overlay.ui:99
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "बचत असफल कागजात “%s”"
+
+#: src/help-overlay.ui:106
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "इमेल कागजात"
+
+#: src/help-overlay.ui:113
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "यो कागजातलाई मुद्रण गर्नुहोस्"
+
+#: src/help-overlay.ui:120
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "क्लिपबोर्डमा प्रतिलिपि गर्नुहोस् ।"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "स्क्यानर"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#, fuzzy
+msgid "Scan Sides"
+msgstr "साइड:"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "पन्नाको आकार"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "अगाडी ल्याउनुहोस्"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "पछाडि"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "दुवै"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "ढिलाई"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#, fuzzy
+msgid "Multiple page from flatbed"
+msgstr "कर्सरको स्थानदेखि पृष्ठ चय नित ।"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "३"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "५"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "७"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "१०"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "१५"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "सेकेन्ड"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "स्क्यान गर्दै"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "पाठ रिजोल्युसन"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#, fuzzy
+msgid "_Photo Resolution"
+msgstr "फोटो रिजोल्युसन"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "चम्लिकोपना"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "व्यतिरेक"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "गुणस्तर"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "स्वाचालित"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "अँध्यारो"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "उज्यालो"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "भन्दा सानो"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "बढि"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, fuzzy, c-format
+msgid "%d dpi (default)"
+msgstr "फन्ट DPI"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, fuzzy, c-format
+msgid "%d dpi (draft)"
+msgstr "ड्राफ्ट"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, fuzzy, c-format
+msgid "%d dpi (high resolution)"
+msgstr "उच्च-रिजोल्युसन किनारा अनुसन्धान"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, fuzzy, c-format
+msgid "%d dpi"
+msgstr "DPI"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+#, fuzzy
+msgid "Unable to connect to scanner"
+msgstr "स्क्यानर"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+#, fuzzy
+msgid "Unable to start scan"
+msgstr "फ्रन्टइन्ड सुरु गर्न अक्षम: %s"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+#, fuzzy
+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:392
+msgid "Failed to scan"
+msgstr "स्क्यान असफल"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+#, fuzzy
+msgid "Scan in progress"
+msgstr "प्रगति"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#, fuzzy
+msgid "[DEVICE…] — Scanning utility"
+msgstr "स्क्यान गर्दै"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, fuzzy, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "उपलब्ध कमाण्ड लाइन विकल्पको पूरै सूची हेर्न  '%s --help' चलाउनुहोस् ।"
diff --git a/po/nl.gmo b/po/nl.gmo
deleted file mode 100644
index 708ad87..0000000
--- a/po/nl.gmo
+++ /dev/null
diff --git a/po/nl.po b/po/nl.po
index de9cde2..649b11e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,523 +1,540 @@
 # Dutch 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.
 #
+# Nathan Follens <nthn@unseen.is>, 2017.
+# Hannie Dumoleyn <hannie@ubuntu-nl.org>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-"
+"scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-25 12:56+0100\n"
+"Last-Translator: Hannie Dumoleyn <hannie@ubuntu-nl.org>\n"
+"Language-Team: Dutch <gnome-nl-list@gnome.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "M_achtigen"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Te gebruiken scanapparaat"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Gebr_uikersnaam voor bron:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-apparaat om beeld van te ontvangen"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Wachtwoord:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Type document dat gescand wordt"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Voor- en achterzijde"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Het type document dat gescand wordt. Deze instelling bepaalt de te scannen "
+"resolutie, kleuren en nabewerking."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Voorzijde"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Breedte van het papier in tienden van een mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Achterzijde"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"De breedte van het papier in tienden van een mm (of 0 voor automatische "
+"papierdetectie)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+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:31
+msgid ""
+"The height 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 "
+"papierdetectie)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Helderheid van de scan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+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:40
+msgid "Contrast of scan"
+msgstr "Contrast van de scan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Resolutie voor gescande tekst"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolutie voor gescande foto's"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Te scannen paginazijde"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "De paginazijde om te scannen."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Map om bestanden in op te slaan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Vertraging tussen pagina's in milliseconden"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Vertraging tussen pagina's in milliseconden."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Scannen"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Documenten scannen"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sc_annen"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Een heel makkelijke manier om zowel documenten als foto's te scannen. U kunt "
+"de lelijke delen van een foto wegsnijden en hem draaien als hij niet goed "
+"staat. U kunt uw scans afdrukken, exporteren naar pdf, of opslaan in een "
+"reeks afbeeldingsbestandsoorten."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan gebruikt het SANE-kader om de meeste scanners te kunnen "
+"gebruiken."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Documentenscanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Enkele _pagina"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Alle pagina's van in_voer"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Scannen staken"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Meerdere pagina's van vlakbed"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sc_annen"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Scannen staken"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Bladzijden herschikken"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mailen"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Bijsnijden"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "VS _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "VS Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Aangepast"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Bijsnijden d_raaien"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Naar links verplaatsen"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Naar rechts verplaatsen"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Een nieuw document beginnen"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nieuw"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Een enkele pagina scannen"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Opslaan"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "De huidige scan stoppen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stoppen"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "De pagina linksom draaien (tegen de klok in)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Linksom draaien"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "De pagina rechtsom draaien (met de klok mee)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Rechtsom draaien"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "De geselecteerde pagina bijsnijden"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Bijsnijden"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Scanner:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Tekstresolutie:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotoresolutie:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Scangrootte:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Paginagrootte:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Helderheid:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kwaliteit:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Documentenscanner"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Zoeken naar scanners…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Documenten scannen"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Sluiten"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  ‘%s’"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Klaar om te scannen"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Een heel makkelijke manier om zowel documenten als foto's te scannen. U kunt "
-"de lelijke delen van een foto wegsnijden en hem draaien als hij niet goed "
-"staat. U kunt uw scans afdrukken, exporteren naar pdf, of opslaan in een "
-"reeks afbeeldingsbestandsoorten."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Extra programmatuur vereist"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan gebruikt het SANE-kader om de meeste scanners te kunnen "
-"gebruiken."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Kan niet verbinden met de scanner"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Kan de scan niet starten"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"PDF-bestanden repareren die gegenereerd zijn door oudere versies van Simple "
-"Scan"
-
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "Scannen is mislukt"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[APPARAAT...] - Hulpmiddel voor scannen"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Voer ‘%s --help’ uit om een volledige lijst van alle opdrachtregelopties te "
-"zien."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Sluiten"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  '%s'"
+"U dient <a href=\"install-firmware\">een stuurprogramma te installeren</a>"
+" voor uw scanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Extra programmatuur vereist"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "U dient een stuurprogramma te installeren voor uw scanner."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Opslaan als..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Opslaan als…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Opslaan"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alle bestanden"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (document met meerdere pagina's)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (gecomprimeerd)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (gecomprimeerd)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Bestandsformaat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressie:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Het bestand ‘%s’ bestaat al. Wilt u het vervangen?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "Ve_rvangen"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Bezig met opslaan"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Bestand opslaan mislukt"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Contact maken met _Scanner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Opslaan van afbeelding voor voorvertoning mislukt"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Zijden samenvoegen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Zijden samenvoegen (omgekeerd)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Omgekeerd"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Onveranderd laten"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -548,23 +565,23 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Dionysos https://launchpad.net/~dionysoz\n"
 "  Elco https://launchpad.net/~eajnab\n"
 "  Hannie Dumoleyn https://launchpad.net/~lafeber-dumoleyn\n"
 "  Jeroen Hoek https://launchpad.net/~mail-jeroenhoek\n"
-"  Joren https://launchpad.net/~jorenn\n"
 "  Justin https://launchpad.net/~jusgje\n"
 "  Martijn Bastiaan https://launchpad.net/~hmb1\n"
 "  Michaël Van Dorpe https://launchpad.net/~michael-vandorpe\n"
@@ -579,201 +596,552 @@ msgstr ""
 "  Wouter Bolsterlee https://launchpad.net/~uws\n"
 "  cumulus007 https://launchpad.net/~cumulus-007\n"
 "  kay van der Zander https://launchpad.net/~kay20\n"
-"  rob https://launchpad.net/~rvdb"
+"  rob https://launchpad.net/~rvdb\n"
+"  Nathan Follens"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "U lijkt een Brother-scanner te hebben."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Stuurprogramma's hiervoor zijn beschikbaar op de <a "
-"href=\"http://support.brother.com\">website van Brother</a>."
+"Stuurprogramma's hiervoor zijn beschikbaar op de <a href=\"http://support."
+"brother.com\">website van Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "U lijkt een Samsung-scanner te hebben."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Stuurprogramma's hiervoor zijn beschikbaar op de <a "
-"href=\"http://samsung.com/support\">website van Samsung</a>."
+"Stuurprogramma's hiervoor zijn beschikbaar op de <a href=\"http://samsung."
+"com/support\">website van Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "U lijkt een HP-scanner te hebben."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "U lijkt een Epson-scanner te hebben."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Stuurprogramma's hiervoor zijn beschikbaar op de <a "
-"href=\"http://support.epson.com\">Epson-website</a>."
+"Stuurprogramma's hiervoor zijn beschikbaar op de <a href=\"http://support."
+"epson.com\">Epson-website</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Stuurprogramma's installeren"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Eenmaal geïnstalleerd, zult u Simple Scan moeten herstarten."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Stuurprogramma's aan het installeren..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Installeren van stuurprogramma's…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Stuurprogramma's met succes geïnstalleerd!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Kon geen stuurprogramma's installeren (foutcode %d)."
+msgstr "Installeren van stuurprogramma's mislukt (foutcode %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr "Kon geen stuurprogramma's installeren."
+msgstr "Installeren van stuurprogramma's mislukt."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
+#, c-format
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "U dient het %s pakket te installeren."
+msgstr[1] "U dient de %s pakketten te installeren."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Sneltoetsen"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Hulp"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Over"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Afsluiten"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Opnieuw starten…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "De pagina linksom draaien (tegen de klok in)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "De pagina rechtsom draaien (met de klok mee)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "De geselecteerde pagina bijsnijden"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "De geselecteerde pagina verwijderen"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "M_achtigen"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Gebr_uikersnaam voor bron:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Wachtwoord:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "U moet de %s pakket(ten) installeren"
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Coderen van pagina %i mislukt"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Scannen"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Een enkele pagina scannen"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Alle pagina's van documentinvoer scannen"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Continu scannen van een flatbedscanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Scan in uitvoering stoppen"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Documentwijziging"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pagina naar links verplaatsen"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pagina naar rechts verplaatsen"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "De pagina linksom draaien (tegen de klok in)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "De pagina rechtsom draaien (met de klok mee)"
+
+#: src/help-overlay.ui:79
+#| msgid "Delay between pages:"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Pagina verwijderen"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Documentbeheer"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Een nieuw document beginnen"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gescand document opslaan"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Gescand document per e-mail versturen"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Gescand document afdrukken"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Huidige pagina naar het klembord kopiëren"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "scanner"
+msgid "_Scanner"
+msgstr "_Scanner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Zijden scannen"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Paginagrootte"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Voorzijde"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Achterzijde"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Beide"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Vertraging"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "_Multiple Pages From Flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Meerdere pagina's van vlakbed"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Seconden"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Bezig met scannen"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Tekstresolutie"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "_Fotoresolutie"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Helderheid"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Kwaliteit"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatisch"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Donkerder"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lichter"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Minder"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Meer"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoge resolutie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nieuw document"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+"Geen scanners beschikbaar. Sluit een scanner aan om dit programma te "
+"gebruiken."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Kan niet verbinden met de scanner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Kan de scan niet starten"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Afdrukken..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Fout tijdens het communiceren met de scanner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Hulp"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Uitgaveversie tonen"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Over"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Debugberichten weergeven"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Afsluiten"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "_Scanner wijzigen"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Scannen is mislukt"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "Stuurprogramma's _installeren"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Scan in uitvoering"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatisch"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[APPARAAT…] — Hulpmiddel voor scannen"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Donkerder"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Voer ‘%s --help’ uit om een volledige lijst van beschikbare"
+" opdrachtregelopties te zien."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Lichter"
+#~ msgid "Front and Back"
+#~ msgstr "Voor- en achterzijde"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Minder"
+#~ msgid "New"
+#~ msgstr "Nieuw"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Meer"
+#~ msgid "Rotate Left"
+#~ msgstr "Linksom draaien"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#~ msgid "Rotate Right"
+#~ msgstr "Rechtsom draaien"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#~ msgid "Crop"
+#~ msgstr "Bijsnijden"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Bezig met opslaan van document..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Scanner:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Bezig met opslaan van pagina %d van %d"
+#~ msgid "New Document"
+#~ msgstr "Nieuw document"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Email..."
+#~ msgstr "E-mail..."
+
+#~ msgid "Print..."
+#~ msgstr "Afdrukken..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "Stuurprogramma's _installeren"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimum"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximum"
+
+#~ msgid "Saving document..."
+#~ msgstr "Bezig met opslaan van document..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Bezig met opslaan van pagina %d van %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -781,7 +1149,6 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "Files missing"
 #~ msgstr "Ontbrekende bestanden"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -792,7 +1159,6 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Controleer uw installatie"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -805,8 +1171,8 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 #~ msgstr ""
 #~ "GTK+ Opties:\n"
-#~ "  --class=KLASSE                   Programmaklasse, zoals gebruikt door de "
-#~ "vensterbeheerder\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"
@@ -817,25 +1183,15 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE als het programmavenster gemaximaliseerd is"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Te gebruiken scanapparaat"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-apparaat om beeld van te ontvangen"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Scanrichting"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type document dat gescand wordt"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Vensterhoogte in pixels"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Vensterbreedte in pixels"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -852,8 +1208,9 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "  --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'"
+#~ "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' "
@@ -864,8 +1221,9 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "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."
+#~ "Type document dat gescand wordt. 'text' voor tekstdocumenten, 'photo' "
+#~ "voor foto's. Deze instelling bepaalt de scanresolutie, de kleuren en "
+#~ "naverwerking."
 
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Hoogte van gescande afbeelding in pixels"
@@ -874,14 +1232,8 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "De hoogte van de gescande afbeelding in pixels. Deze waarde representeert de "
-#~ "laatst gescande pagina."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolutie voor gescande tekst"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolutie voor gescande foto's"
+#~ "De hoogte van de gescande afbeelding in pixels. Deze waarde representeert "
+#~ "de laatst gescande pagina."
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
@@ -891,95 +1243,24 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgstr "Resolutie van laatste gescande afbeelding"
 
 #~ 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."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Map om bestanden in op te slaan"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
-#~ "foto's."
+#~ "De breedte van de gescande afbeelding in pixels. Deze waarde "
+#~ "representeert de laatst gescande pagina."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Breedte van gescande afbeelding in pixels"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Gescand document"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Bestands_type selecteren"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Te scannen paginazijde"
-
-#~ msgid ""
-#~ "The height 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 "
-#~ "papierdetectie)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Hoogte van het papier in tienden van een mm"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "De breedte van het papier in tienden van een mm (of 0 voor automatische "
-#~ "papierdetectie)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Breedte van het papier in tienden van een mm"
-
-#~ 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’."
-
-#~ msgid "The page side to scan."
-#~ msgstr "De paginazijde om te scannen."
-
 #~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Het type document dat gescand wordt. Deze instelling bepaalt de te scannen "
-#~ "resolutie, kleuren en nabewerking."
+#~ "De te scannen paginazijde. Mogelijke waarden zijn ‘both’, ‘front’ en "
+#~ "‘back’."
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "De richting van de scanner over de te scannen pagina."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Aanpassing van het contrast van -100 tot 100 (0 is geen)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrast van de scan"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Aanpassing van de helderheid van -100 tot 100 (0 is geen)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Helderheid van de scan"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie"
diff --git a/po/oc.gmo b/po/oc.gmo
deleted file mode 100644
index 5e5f01e..0000000
--- a/po/oc.gmo
+++ /dev/null
diff --git a/po/oc.po b/po/oc.po
index ab92be0..a4cccda 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,297 +7,311 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2013-10-15 16:43+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Utilizaire :"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "Sen_hal :"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Recto verso"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Fàcia"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Precedenta"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Aisina de numerizacion simpla"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Nu_merizar"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "_Pagina unica"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Totas las paginas del _nauc"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "_Arrestar la numerizacion"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Tèxte"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Fòto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reorganizar las paginas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Corrièl"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Pivotar cap a es_quèrra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Pivotar cap a _drecha"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "Re_quadrar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Pas cap"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "Pivota_r la seleccion"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Se desplaçar cap a esquèrra"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Se desplaçar cap a drecha"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Ensenhador"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Crear un document novèl"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Novèl"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Numerizar"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Enregistrar lo document dins un fichièr"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Enregistrar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Arrestar la numerizacion en cors"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Arrèsta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 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 on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Rotacion a esquèrra"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 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 rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Rotacion a drecha"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Requadrar la pagina seleccionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Requadrar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferéncias"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "F_ont de numerizacion :"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "Resolucion del _Tèxte :"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "Resolucion de la _fòto :"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Fàcia de numerizar :"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Talha de la pagina :"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Luminositat :"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Qualitat :"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Numerizar de documents"
 
@@ -309,7 +323,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -317,199 +331,210 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 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.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connectar al scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Impossible d'aviar la numerizacion"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Error de comunicacion amb lo scanner"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: 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
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Afichar los messatges de desbugatge"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Fracàs de la numerizacion"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Aisina de numerizacion"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Aviatz « %s --help » per veire la lista completa de opcions disponiblas en "
 "linha de comanda"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "_Tampar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, 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.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Cap de scanner es pas estat detectat"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificatz que vòstre scanner es connectat e jos tension"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
-msgstr ""
+msgstr "Logicial suplementari necessari"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Vos cal installar lo logicial del pilòt de vòstre scanner."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "A_nullar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Salvar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numerizat"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Fichièrs imatges"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipaginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (sens pèrda)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "Format del fichièr :"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 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.vala:673
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
 msgstr "S'enregistratz pas, las modificacions seràn perdudas definitivament."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "Enregistrar lo document actual ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Abandonar las modificacions"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Impossible de dobrir l'aplicacion de previsualizacion d'imatge"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
-msgstr ""
+msgstr "Associar los costats"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Associar los costats (inversar)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Inversar"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Manténer incambiat"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Impossible de dobrir lo fichièr d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -539,16 +564,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "A prepaus de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -556,189 +581,189 @@ msgstr ""
 "  Quentin Pagès https://launchpad.net/~kwentin"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "Enregistrar lo document abans de quitar ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Quitar sens enregistrar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
-msgstr ""
+msgstr "Installar los pilòts"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Un còp installats, vos caldrà reaviar Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Installacion dels pilòts..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (per defaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrolhon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (nauta resolucion)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Document novèl"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "A prepaus"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Quitar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Mai escur"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Mai clar"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Mens"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Mai"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Enregistrament del document..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrament de la pagina %d sus %d"
diff --git a/po/pa.gmo b/po/pa.gmo
deleted file mode 100644
index 6c81c69..0000000
--- a/po/pa.gmo
+++ /dev/null
diff --git a/po/pa.po b/po/pa.po
index 0f5f67f..ffe4a6f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,511 +1,534 @@
 # 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.
 #
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# A S Alam <aalam@users.sf.net>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-04-17 06:12+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-"
+"scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-20 19:30-0600\n"
+"Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "ਪਰਮਾਣਿਤ(_A)"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "ਸਰੋਤ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ(_U):"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "ਚਿੱਤਰ ਲੈਣ ਲਈ ਸੈਨ (SANE) ਜੰਤਰ"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "ਪਾਸਵਰਡ(_P):"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਡੌਕੂਮੈਂਟ ਦੀ ਕਿਸਮ"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "ਅੱਗੇ ਅਤੇ ਪਿੱਛੇ"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"ਸਕੈਨ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਦਸਤਾਵੇਜ਼ ਦੀ ਕਿਸਮ ਹੈ। ਇਹ ਸੈਟਿੰਗ ਸਕੈਨ ਰੈਜ਼ੋਲੂਸ਼ਨ, ਰੰਗ ਅਤੇ"
+" ਸਕੈਨ ਕਰਨ ਤੋਂ ਬਾਅਦ ਦੀਆਂ ਕਾਰਵਾਈਆਂ "
+"ਤਹਿ ਕਰਦੀ ਹੈ।"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "ਅੱਗੇ"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "ਮਿਲੀਮੀਟਰ ਦੇ ਦਸਵੇਂ ਹਿੱਸੇ 'ਚ ਪੇਪਰ ਦੀ ਚੌੜਾਈ"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "ਪਿੱਛੇ"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "ਮਿਲੀਮੀਟਰ ਦੇ ਦਸਵੇਂ ਹਿੱਸੇ 'ਚ ਪੇਪਰ ਦੀ ਉਚਾਈ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+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:35
+#| msgid "Direction of scan"
+msgid "Brightness of scan"
+msgstr "ਸਕੈਨ ਦੀ ਚਮਕ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "-100 ਤੋਂ 100 ਤੱਕ ਚਮਕ ਅਡਜੱਸਟਮੈਂਟ (0 ਭਾਵ ਕੁਝ ਨਹੀਂ)।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+#| msgid "Direction of scan"
+msgid "Contrast of scan"
+msgstr "ਸਕੈਨ ਦਾ ਕਨਟਰਾਸਟ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "-100 ਤੋਂ 100 ਤੱਕ ਕਨਟਰਾਸਟ ਅਡਜੱਸਟਮੈਂਟ (0 ਭਾਵ ਕੁਝ ਨਹੀਂ)।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "ਲਿਖਤ ਸਕੈਨ ਲਈ ਰੈਜ਼ੋਲੂਸ਼ਨ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"ਟੈਕਸਟ ਨੂੰ ਸਕੈਨ ਕਰਨ ਦੌਰਾਨ ਵਰਤਣ ਵਾਸਤੇ ਰੈਜ਼ੋਲੂਸ਼ਨ ਪ੍ਰਤੀ-ਇੰਚ-ਬਿੰਦੀਆਂ ਦੇ ਰੂਪ 'ਚ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "ਫੋਟੋ ਸਕੈਨ ਲਈ ਰੈਜੋਲੂਸ਼ਨ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "ਫੋਟੋ ਸਕੈਨ ਕਰਨ ਦੌਰਾਨ ਵਰਤਣ ਵਾਸਤੇ ਰੈਜ਼ੋਲੂਸ਼ਨ ਪ੍ਰਤੀ-ਇੰਚ-ਬਿੰਦੀਆਂ ਦੇ ਰੂਪ 'ਚ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+#| msgid "Page side to scan"
+msgid "The page side to scan."
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਹੈ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਡਿਫਾਲਟ ਡੌਕੂਮੈਂਟ ਡਾਇਰੈਕਟਰੀ"
+" ਹੈ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG ਕੰਪਰੈਸ਼ਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਕੁਆਲਟੀ ਮੁੱਲ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG ਕੰਪਰੈਸ਼ਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਕੁਆਲਟੀ ਮੁੱਲ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "ਸਫ਼ਿਆਂ ਦੇ ਵਿਚਾਲੇ ਮਿਲੀਸਕਿੰਟਾਂ 'ਚ ਦੇਰੀ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "ਸਫ਼ਿਆਂ ਦੇ ਵਿਚਾਲੇ ਮਿਲੀਸਕਿੰਟਾਂ 'ਚ ਦੇਰੀ।"
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "ਸੌਖਾ ਸਕੈਨ"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "ਡੌਕੂਮੈਂਟ(_D)"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "ਸਕੈਨ ਕਰੋ(_a)"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"ਸੈਂਪਲ ਸਕੈਨਰ ਸਭ ਤੋਂ ਵੱਧ ਮੌਜੂਦ ਸਕੈਨਰਾਂ ਲਈ ਸਹਿਯੋਗ ਵਾਸਤੇ SANE ਫਰੇਮਵਰਕ ਵਰਤਦਾ ਹੈ।"
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "ਡੌਕੂਮੈਂਟ ਸਕੈਨਰ"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "ਸਕੈਨ;ਸਕੈਨਰ;ਸਕੈਨ ਕਰੋ;ਫਲੈਟਬੈਡ;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "ਇੱਕਲਾ ਸਫ਼ਾ(_P)"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "ਫੀਡਰ ਤੋਂ ਸਭ ਸਫ਼ੇ(_F)"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "ਸਕੈਨ ਨੂੰ ਰੋਕੋ(_S)"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "ਫਲੈਟਬੈਡ ਤੋਂ ਕਈ ਸਫ਼ੇ(_M)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "ਟੈਕਸਟ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "ਫੋਟੋ"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "ਡੌਕੂਮੈਂਟ(_D)"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "ਸਕੈਨ ਕਰੋ(_a)"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "ਸਕੈਨ ਨੂੰ ਰੋਕੋ(_S)"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
-msgstr ""
+msgstr "ਸਫ਼ਿਆਂ ਦੀ ਲੜੀ ਬਦਲੋ"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "ਈਮੇਲ(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "ਸਫ਼ਾ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "ਕਰੋਪ ਕਰੋ(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "ਕੁਝ ਨਹੀਂ(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "ਪੱਤਰ(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "ਲੀਗਲ(_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "ਕਰੋਪ ਨੂੰ ਘੁੰਮਾਓ(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
-msgstr ""
+msgstr "ਖੱਬੇ ਭੇਜੋ"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
-msgstr ""
+msgstr "ਸੱਜੇ ਭੇਜੋ"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "ਨਵਾਂ ਡੌਕੂਮੈਂਟ ਸ਼ੁਰੂ ਕਰੋ"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "ਨਵਾਂ"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "ਸਕੈਨਰ ਤੋਂ ਇੱਕਲਾ ਸਫ਼ਾ ਸਕੈਨ ਕਰੋ"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "ਸਕੈਨ"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "ਮੌਜੂਦਾ ਸਕੈਨ ਰੋਕੋ"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "ਰੋਕੋ"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "…ਸਕੈਨਰ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "ਕਰੋਪ ਕਰੋ"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "ਮੇਰੀ ਪਸੰਦ"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "ਸਕੈਨ ਸਰੋਤ(_o):"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "ਟੈਕਸਟ ਰੈਜ਼ੋਲੂਸ਼ਨ(_T):"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "ਫੋਟੋ ਰੈਜ਼ੋਲੂਸ਼ਨ(_P):"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "ਸਕੈਨ ਸਾਈਡ"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "ਸਫਾ ਆਕਾਰ:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr ""
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr ""
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr ""
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "ਬੰਦ ਕਰੋ(_C)"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "“%s” ਵਰਤਣ ਲਈ ਵਰਤੋਂਕਾਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਤਿਆਰ"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "ਹੋਰ ਸਾਫਟਵੇਅਰ ਚਾਹੀਦੇ ਹਨ"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "ਕੋਈ ਵੀ ਸਕੈਨਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਸਕੈਨਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "ਸਕੈਨਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "ਸਕੈਨ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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:391
-msgid "Failed to scan"
-msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr ""
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "'%s' ਵਰਤਣ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
+"ਤੁਹਾਨੂੰ ਆਪਣੇ ਸਕੈਨਰ ਲਈ <a href=\"install-firmware\">ਡਰਾਇਵਰ ਸਾਫਟਵੇਅਰ ਇੰਸਟਾਲ</a>"
+" ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "ਕੋਈ ਸਕੈਨਰ ਨਹੀਂ ਮਿਲਿਆ"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "ਆਪਣੇ ਜੁੜ ਹੋਏ ਸਕੈਨਰ ਨੂੰ ਚੈੱਕ ਕਰੋ ਅਤੇ ਚਾਲੂ ਕਰੋ"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "…ਵਜੋਂ ਸੰਭਾਲੋ"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
-msgstr ""
+msgstr "ਰੱਦ ਕਰੋ(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
-msgstr ""
+msgstr "ਸੰਭਾਲੋ(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (ਬਹੁ-ਸਫ਼ਾ ਡੌਕੂਮੈਂਟ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr "JPEG (compressed)"
+msgstr "JPEG (ਕੰਪਰੈਸਡ)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (ਕੰਪਰੈਸਡ)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
+msgstr "ਫਾਇਲ ਫਾਰਮੈਟ:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "ਕੰਪਰੈੱਸ਼ਨ:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr ""
+"ਇੱਕ ਫਾਇਲ ਨਾਂ “%s” ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "ਬਦਲੋ(_R)"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "ਜੇ ਤੁਸੀਂ ਨਾ ਸੰਭਾਲਿਆ ਤਾਂ ਸਭ ਬਦਲਾਅ ਖਤਮ ਹੋ ਜਾਣਗੇ।"
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "ਮੌਜੂਦਾ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "ਬਦਲਾਅ ਅਣਡਿੱਠੇ"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "…ਸਕੈਨਰ ਨਾਲ ਸੰਪਰਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr ""
+msgstr "ਝਲਕ ਲਈ ਚਿੱਤਰ ਸੰਭਾਲਣ ਵਾਸਤੇ ਅਸਮਰੱਥ"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "ਚਿੱਤਰ ਝਲਕ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
-msgstr ""
+msgstr "ਪਾਸਿਓ ਨੂੰ ਜੋੜੋ"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "ਪਾਸਿਓ ਨੂੰ ਜੋੜੋ (ਉਲਟ)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr ""
+msgstr "ਉਲਟ"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
-msgstr ""
+msgstr "ਅਣ-ਬਦਲਿਆ ਹੀ ਰੱਖੋ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
-msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
+msgstr "ਮਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -520,239 +543,538 @@ 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"
+"GNU ਜਨਰਲ ਪਬਲਿਕ ਲਸੰਸ; ਵਰਜਨ 3, ਜਾਂ (ਤੁਹਾਡੀ ਪਸੰਦ ਮੁਤਾਬਿਕ) ਨਵੇਂ, ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਧੀਨ\n"
+"ਰੀ-ਡਿਸਟੀਬਿਊਟ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ\n"
+"\n"
+"ਇਸ ਪਰੋਗਰਾਮ ਨੂੰ ਡਿਸਟਰੀਬਿਊਟ ਕਰਨ ਦਾ ਮਕਸਦ ਹੈ ਕਿ ਇਹ ਵਰਤੋਂ ਯੋਗ ਹੋਵੇਗਾ, ਪਰ ਬਿਨਾਂ"
+" ਕਿਸੇ ਵਾਰੰਟੀ;\n "
+"ਗਾਹਕ ਦੀ ਵਾਰੰਟੀ ਤੋਂ ਵੀ ਬਿਨਾਂ ਜਾਂ ਕਿਸੇ ਖਾਸ ਉਦੇਸ਼ ਦੀ ਪੂਰਤੀ ਵਾਲੀ ਵਾਰੰਟੀ ਤੋਂ ਬਿਨਾਂ।"
+"  ਵਧੇਰੇ\n"
+"ਜਾਣਕਾਰੀ ਲਈ GNU ਜਨਰਲ ਪਬਲਿਕ ਲਸੰਸ ਵੇਖੋ।\n"
+"\n"
+"ਤੁਹਾਨੂੰ ਇਸ ਪਰੋਗਰਾਮ ਨਾਲ GNU ਜਨਰਲ ਪਬਲਿਕ ਲਸੰਸ ਦੀ ਕਾਪੀ ਵੀ ਮਿਲਣੀ ਚਾਹੀਦੀ ਹੈ।\n"
+"ਜੇ ਨਹੀਂ, ਤਾਂ <http://www.gnu.org/licenses/> ਵੇਖੋ।"
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "ਸੈਂਪਲ ਸਕੈਨ ਬਾਰੇ"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "ਸੈਂਪਲ ਡੌਕੂਮੈਂਟ ਸਕੈਨਿੰਗ ਟੂਲ"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 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:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਕੋਲ Brother ਸਕੈਨਰ ਜਾਪਦਾ ਹੈ।"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"ਇਸ ਵਾਸਤੇ ਡਰਾਇਵਰ <a href=\"http://support.brother.com"
+"\">Brother ਵੈੱਬਸਾਈਟ</a> 'ਤੇ ਮੌਜੂਦ ਹਨ।"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਕੋਲ ਸੈਮਸੰਗ ਸਕੈਨਰ ਜਾਪਦਾ ਹੈ।"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"ਇਸ ਵਾਸਤੇ ਡਰਾਇਵਰ <a href=\"http://samsung.com/support"
+"\">Samsung ਵੈੱਬਸਾਈਟ</a> 'ਤੇ ਮੌਜੂਦ ਹਨ।"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਕੋਲ HP ਸਕੈਨਰ ਜਾਪਦਾ ਹੈ।"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਕੋਲ ਇਪਸਨ (Epson) ਸਕੈਨਰ ਜਾਪਦਾ ਹੈ।"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
+"ਇਸ ਵਾਸਤੇ ਡਰਾਇਵਰ <a href=\"http://support.epson.com"
+"\">Epson ਵੈੱਬਸਾਈਟ</a> 'ਤੇ ਮੌਜੂਦ ਹਨ।"
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "ਡਰਾਇਵਰ ਇੰਸਟਾਲ ਕਰੋ"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "ਇੰਸਟਾਲ ਕਰਨ ਦੇ ਬਾਅਦ ਤੁਹਾਨੂੰ ਸੈਂਪਲ ਸਕੈਨ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ।"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "…ਡਰਾਇਵਰ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "ਡਰਾਇਵਰ ਕਾਮਯਾਬੀ ਨਾਲ ਇੰਸਟਾਲ ਕੀਤੇ ਗਏ!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "ਡਰਾਇਵਰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਅਸਫ਼ਲ ਹੈ (ਗਲਤੀ ਕੋਡ %d)।"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "ਡਰਾਇਵਰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "ਤੁਹਾਨੂੰ %s ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+msgstr[1] "ਤੁਹਾਨੂੰ %s ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "ਮੇਰੀ ਪਸੰਦ"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (ਡਿਫਾਲਟ)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (draft)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "ਮਦਦ"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "ਇਸ ਬਾਰੇ"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "ਬਾਹਰ"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "ਈਮੇਲ ਕਰੋ"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "…ਮੁੜ ਸ਼ੁਰੂ ਕਰੋ"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਹਟਾਓ"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "ਪਰਮਾਣਿਤ(_A)"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "ਸਰੋਤ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ(_U):"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "ਪਾਸਵਰਡ(_P):"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "%i ਸਫ਼ੇ ਨੂੰ ਇੰਕੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "ਇਕੱਲੇ ਸਫ਼ੇ ਨੂੰ ਸਕੈਨ ਕਰੋ"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "ਡੌਕੂਮੈਂਟ ਫੀਡਰ ਤੋਂ ਸਾਰੇ ਸਫ਼ੇ ਸਕੈਨ ਕਰੋ"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "ਫਲੈਟਬੈਡ ਸਕੈਨਰ ਤੋਂ ਲਗਾਤਾਰ ਸਕੈਨ ਕਰੋ"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "ਜਾਰੀ ਸਕੈਨ ਕਰਨ ਨੂੰ ਰੋਕੋ"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "ਡੌਕੂਮੈਂਟ ਸੋਧ"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "ਸਫ਼ਾ ਖੱਬੇ ਪਾਸੇ ਭੇਜੋ"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "ਸਫ਼ਾ ਸੱਜੇ ਪਾਸੇ ਭੇਜੋ"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਓ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਓ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਹਟਾਓ"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "ਡੌਕੂਮੈਂਟ ਪਰਬੰਧ"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "ਨਵਾਂ ਡੌਕੂਮੈਂਟ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr ""
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ ਨੂੰ ਸੰਭਾਲੋ"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ ਨੂੰ ਈਮੇਲ ਕਰੋ"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ ਨੂੰ ਪਰਿੰਟ ਕਰੋ"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "ਮੌਜੂਦਾ ਸਫ਼ੇ ਨੂੰ ਕਲਿੱਪਬੋਰਡ 'ਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr ""
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "ਸਕੈਨਰ(_S)"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr ""
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "ਸਲਾਈਡਾਂ ਨੂੰ ਸਕੈਨ ਕਰੋ"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr ""
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "ਸਫਾ ਆਕਾਰ"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr ""
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "ਅੱਗੇ"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr ""
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "ਪਿੱਛੇ"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr ""
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "ਦੋਵੇਂ"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "ਦੇਰੀ"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "ਫਲੈਟਬੈਡ ਤੋਂ ਕਈ ਸਫ਼ੇ"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "ਸਕਿੰਟ"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "ਟੈਕਸਟ ਰੈਜ਼ੋਲੂਸ਼ਨ(_T)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr ""
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "ਫੋਟੋ ਰੈਜ਼ੋਲੂਸ਼ਨ(_P)"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "ਚਮਕ"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "ਕਨਟਰਾਸਟ"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "ਕੁਆਲਟੀ"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
-msgstr ""
+msgstr "ਗੂੜ੍ਹਾ"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
-msgstr ""
+msgstr "ਫਿੱਕਾ"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
-msgstr ""
+msgstr "ਘੱਟ"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
-msgstr ""
+msgstr "ਹੋਰ"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr ""
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (ਡਿਫਾਲਟ)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr ""
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (draft)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr ""
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr ""
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "ਕੋਈ ਵੀ ਸਕੈਨਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਸਕੈਨਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
 
-#~ msgid "Direction of scan"
-#~ msgstr "ਸਕੈਨ ਦੀ ਦਿਸ਼ਾ"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "ਸਕੈਨਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
 
-#~ msgid "Device to scan from"
-#~ msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "ਸਕੈਨ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "ਸਕੈਨਰ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "ਚਿੱਤਰ ਲੈਣ ਲਈ ਸੈਨ (SANE) ਜੰਤਰ"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "ਰੀਲਿਜ਼ ਵਰਜਨ ਵੇਖਾਓ"
 
-#~ msgid "Type of document being scanned"
-#~ 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:392
+msgid "Failed to scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "ਸਕੈਨ ਕਰਨਾ ਜਾਰੀ ਹੈ"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid ""
+#| "Usage:\n"
+#| "  %s [DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — ਸਕੈਨ ਕਰਨ ਦੀ ਸਹੂਲਤ"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "ਵਰਤੋਂ:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "ਪੂਰੀਆਂ ਉਪਲੱਬਧ ਕਮਾਂਡ ਲਾਈਨ ਚੋਣਾਂ ਵੇਖਣ ਵਾਸਤੇ ”%s --help” ਚਲਾਓ।"
+
+#~ msgid "Front and Back"
+#~ msgstr "ਅੱਗੇ ਅਤੇ ਪਿੱਛੇ"
 
-#~ msgid "Scanned Document"
-#~ msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
+#~ msgid "New"
+#~ msgstr "ਨਵਾਂ"
+
+#~ msgid "Rotate Left"
+#~ msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
+
+#~ msgid "Rotate Right"
+#~ msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
+
+#~ msgid "Crop"
+#~ msgstr "ਕਰੋਪ ਕਰੋ"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "ਸਕੈਨ ਸਰੋਤ(_o):"
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
 
 #~ msgid "Select File _Type"
 #~ msgstr "ਫਾਇਲ ਕਿਸਮ ਚੁਣੋ(_T)"
@@ -760,20 +1082,5 @@ msgstr ""
 #~ msgid "Please check your installation"
 #~ msgstr "ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ ਜੀ"
 
-#~ msgid "Page side to scan"
-#~ msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "ਟੈਕਸਟ ਸਕੈਨ ਲਈ ਰੈਜ਼ੋਲੂਸ਼ਨ"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "ਫੋਟੋ ਸਕੈਨ ਲਈ ਰੈਜੋਲੂਸ਼ਨ"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ਆਖਰੀ ਸਕੈਨ ਕੀਤੇ ਚਿੱਤਰ ਦਾ ਰੈਜ਼ੋਲੂਸ਼ਨ"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਹੈ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਡਿਫਾਲਟ ਡੌਕੂਮੈਂਟ ਡਾਇਰੈਕਟਰੀ "
-#~ "ਹੈ।"
diff --git a/po/pl.gmo b/po/pl.gmo
deleted file mode 100644
index a9ddad3..0000000
--- a/po/pl.gmo
+++ /dev/null
diff --git a/po/pl.po b/po/pl.po
index 1b09107..97dca48 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,517 +1,528 @@
-# Polish translation for simple-scan
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Polish translation for simple-scan.
+# Copyright © 2009-2017 the simple-scan authors.
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2017.
+# Aviary.pl <community-poland@mozilla.org>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-07-31 16:41+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-11 03:50+0000\n"
+"PO-Revision-Date: 2017-09-20 04:44+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <pl@li.org>\n"
+"Language-Team: Polish <community-poland@mozilla.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Upow_ażnij"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Urządzenie skanujące"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nazwa _użytkownika dla zasobu:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Urządzenie SANE do pobierania obrazu."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Hasło:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Typ skanowanego dokumentu"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Przód i tył"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ skanowanego dokumentu. To ustawienie decyduje o rozdzielczości "
+"skanowania, kolorach i przetwarzaniu końcowym."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Przód"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Szerokość papieru w dziesiątkach milimetrów"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Tył"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Szerokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
+"wykrywania papieru)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Wysokość papieru w dziesiątkach milimetrów"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height 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 "
+"wykrywania papieru)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Jasność skanowania"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+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:40
+msgid "Contrast of scan"
+msgstr "Kontrast skanowania"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Rozdzielczość skanowanego tekstu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"Rozdzielczość używana podczas skanowania tekstu w punktach na cal (DPI)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Rozdzielczość skanowanych zdjęć"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Rozdzielczość używana podczas skanowania zdjęć w punktach na cal (DPI)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Strona kartki do skanowania"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Strona kartki do skanowania."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Katalog do zapisania plików"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Wartość jakości używana do kompresji JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Wartość jakości używana do kompresji JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Opóźnienie między stronami w milisekundach"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Opóźnienie między stronami w milisekundach."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Proste skanowanie"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skanowanie dokumentów"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_anowanie"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Bardzo prosty sposób na skanowanie dokumentów i zdjęć. Umożliwia kadrowanie "
+"i obracanie zdjęć, drukowanie, eksportowanie do formatu PDF oraz zapisywanie "
+"w wielu formatach."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Program Proste skanowanie używa mechanizmu SANE do obsługi większości "
+"istniejących skanerów."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skaner dokumentów"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Pojedyncza strona"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "_Wszystkie strony z podajnika"
+msgstr "_Wszystkie strony z podajnika"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Zatrzymaj _skanowanie"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Wiele _stron ze skanera płaskiego"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Zdjęcie"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_anowanie"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zatrzymaj skanowanie"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Zmień kolejność stron"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Strona"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
-msgstr "Obróć w _lewo"
+msgstr "Obróć w _lewo"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
-msgstr "Obróć w p_rawo"
+msgstr "Obróć w p_rawo"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Kadruj"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Brak"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Niestandardowy"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Ob_róć obszar kadrowania"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
-msgstr "Przesuń w lewo"
+msgstr "Przesuń w lewo"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
-msgstr "Przesuń w prawo"
+msgstr "Przesuń w prawo"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "Pomo_c"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Spis treści"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Tworzy nowy dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nowy"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Skanuje pojedynczą stronę ze skanera"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skanuj"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Zapisz"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zatrzymuje bieżące skanowanie"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Obraca stronę w lewo (przeciwnie do ruchu wskazówek zegara)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Obróć w lewo"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Obraca stronę w prawo (zgodnie z ruchem wskazówek zegara)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Obróć w prawo"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Kadruje zaznaczoną stronę"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Kadruj"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferencje"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Źródło skan_owania:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Rozdzielczość tekstu:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Rozdzielczość z_djęcia:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skanowanie stron:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Rozmiar strony:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Jasność:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Wyszukiwanie skanerów…"
 
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Jakość:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Skaner dokumentów"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skanowanie dokumentów"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "Za_mknij"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Uzyskanie dostępu do „%s” wymaga podania nazwy użytkownika i hasła"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "scanner"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Można rozpocząć skanowanie"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Bardzo prosty sposób na skanowanie dokumentów i zdjęć. Umożliwia kadrowanie "
-"i obracanie zdjęć, drukowanie, eksportowanie do formatu PDF oraz zapisywanie "
-"w wielu formatach."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Wymagane jest dodatkowe oprogramowanie"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Program Simple Scan używa mechanizmu SANE do obsługi większości istniejących "
-"skanerów."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Nie można połączyć ze skanerem"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Nie można rozpocząć skanowania"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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 "Wyświetla informacje o wersji"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Wyświetla 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.vala:391
-msgid "Failed to scan"
-msgstr "Skanowanie się nie powiodło"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[URZĄDZENIE…] — narzędzie do skanowania"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Polecenie „%s --help” wyświetli pełną listę dostępnych opcji wiersza poleceń."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "Za_mknij"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Uzyskanie dostępu do „%s” wymaga podania nazwy użytkownika i hasła"
+"Należy <a href=\"install-firmware\">zainstalować sterownik</a> skanera."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
-msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
-
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Wymagane dodatkowe oprogramowanie"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Należy zainstalować sterownik skanera."
+msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Zapisz jako…"
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Zapis jako…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Zapisz"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument wielostronicowy)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (skompresowany)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (skompresowany)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format pliku:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Kompresja:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Plik o nazwie „%s” już istnieje. Zastąpić go?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Zastąp"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Zapisywanie"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Zapisać bieżący dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Łączenie ze skanerem…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Nie można otworzyć programu podglądu obrazów"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Połącz strony"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Połącz strony (odwrotnie)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Odwrotnie"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Bez zmiany"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -529,32 +540,34 @@ msgstr ""
 "Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej\n"
 "i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej\n"
 "przez Fundację Wolnego Oprogramowania (Free Software Foundation) — według\n"
-"wersji trzeciej tej Licencji lub którejś z późniejszych wersji.\n"
+"wersji trzeciej tej Licencji lub którejś z późniejszych wersji.\n"
 "\n"
-"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny "
-"—\n"
-"jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n"
-"PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH\n"
-"ZASTOSOWAŃ. W celu uzyskania bliższych informacji należy zapoznać się z\n"
-"Powszechną Licencją Publiczną GNU.\n"
+"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny\n"
+"— jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n"
+"PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ.\n"
+"W celu uzyskania bliższych informacji należy zapoznać się\n"
+"z Powszechną Licencją Publiczną GNU.\n"
 "\n"
-"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n"
+"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n"
 "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie\n"
 "— proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "O programie"
+msgstr "O programie"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Piotr Drąg <piotrdrag@gmail.com>, 2010-2017\n"
+"Aviary.pl <community-poland@mozilla.org>, 2017\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Arkadiusz Błasiak https://launchpad.net/~ares1112\n"
 "  GTriderXC https://launchpad.net/~gtriderxc\n"
@@ -571,404 +584,462 @@ msgstr ""
 "  Wiatrak https://launchpad.net/~wiatrak."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Zapisać dokument przed zakończeniem programu?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Wykryto skaner marki Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Sterowniki dla tego urządzenia są dostępne na <a "
-"href=\"http://support.brother.com\">stronie firmy Brother</a>."
+"Sterowniki dla tego urządzenia są dostępne na <a href=\"http://support."
+"brother.com\">stronie firmy Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Wykryto skaner marki Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Sterowniki dla tego urządzenia są dostępne na <a "
-"href=\"http://samsung.com/support\">stronie firmy Samsung</a>."
+"Sterowniki dla tego urządzenia są dostępne na <a href=\"http://samsung.com/"
+"support\">stronie firmy Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Wykryto skaner marki HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Wykryto skaner marki Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Sterowniki są dostępne na <a href=\"http://support.epson.com\">stronie firmy "
 "Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr "Instalowanie sterowników"
+msgstr "Instalacja sterowników"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Po ukończeniu instalowania należy uruchomić program ponownie."
+msgstr "Po ukończeniu instalacji należy uruchomić program ponownie."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Instalowanie sterowników…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Zainstalowano sterowniki."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Zainstalowanie sterowników się nie powiodło (kod błędu %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Zainstalowanie sterowników się nie powiodło."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Należy zainstalować pakiety %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Należy zainstalować pakiet %s."
+msgstr[1] "Należy zainstalować pakiety %s."
+msgstr[2] "Należy zainstalować pakiety %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferencje"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d DPI (domyślnie)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Skróty klawiszowe"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d DPI (szkic)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Pomoc"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d DPI (wysoka rozdzielczość)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programie"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Zakończ"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Nowy dokument…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Obraca stronę w lewo (przeciwnie do ruchu wskazówek zegara)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Obraca stronę w prawo (zgodnie z ruchem wskazówek zegara)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Kadruje zaznaczoną stronę"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Usuwa zaznaczoną stronę"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Upow_ażnij"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nazwa _użytkownika dla zasobu:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Hasło:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d DPI"
+msgid "Unable to encode page %i"
+msgstr "Nie można zakodować %i. strony"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skanowanie"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Zeskanowanie pojedynczej strony"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Zeskanowanie wszystkich stron z podajnika dokumentów"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Ciągłe skanowanie z płaskiego skanera"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zatrzymanie trwającego skanowania"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modyfikowanie dokumentów"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Przesunięcie strony w lewo"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Przesunięcie strony w prawo"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Obrót strony w lewo (przeciwnie do ruchu wskazówek zegara)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Obrót strony w prawo (zgodnie z ruchem wskazówek zegara)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Usunięcie strony"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Zarządzanie dokumentami"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Utworzenie nowego dokumentu"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Zapisanie zeskanowanego dokumentu"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Wysłanie zeskanowanego dokumentu pocztą"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Wydrukowanie zeskanowanego dokumentu"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Skopiowanie bieżącej strony do schowka"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nowy dokument"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skaner"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skanowanie stron"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail…"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Rozmiar strony"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Wydrukuj…"
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Przód"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Pomoc"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Tył"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "O programie"
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obie"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Opóźnienie"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Wiele stron ze skanera płaskiego"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "s"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skanowanie"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Zakończ"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Rozdzielczość tekstu"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Rozdzielczość z_djęcia"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Jasność"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Zmień _skaner"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Zainstaluj sterowniki"
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Jakość"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Mniejszy"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Większy"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimalnie"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d DPI (domyślnie)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksymalnie"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d DPI (szkic)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Zapisywanie dokumentu…"
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d DPI (wysoka rozdzielczość)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Zapisywanie strony %d z %d"
+msgid "%d dpi"
+msgstr "%d DPI"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4x6\""
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Brak dostępnych skanerów. Proszę podłączyć skaner."
 
-#~ msgid "Files missing"
-#~ msgstr "Nie można odnaleźć plików"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nie można połączyć ze skanerem"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Użycie:\n"
-#~ "  %s [URZĄDZENIE...] - Narzędzie do skanowania"
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Wysokość zeskanowanego obrazu w pikselach"
-
-#~ msgid "Direction of scan"
-#~ msgstr "Kierunek skanowania"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Urządzenie skanujące"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Rozdzielczość skanowanego tekstu"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Rozdzielczość skanowanych zdjęć"
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Rozdzielczość ostatnio zeskanowanego obrazu"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Katalog do zapisania plików"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Urządzenie SANE do pobierania obrazu."
-
-#~ 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"
-#~ msgstr "Typ skanowanego dokumentu"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Wysokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
-#~ "tej, jaka wynosiła podczas ostatniego skanowania."
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "Wartość \"True\", jeśli okno programu jest zmaksymalizowane"
-
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Rozdzielczość ostatnio skanowanego obrazu w punktach na cal (dpi)."
-
-#~ 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."
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Wysokość okna w pikselach"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Szerokość okna w pikselach"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Zeskanowany dokument"
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Szerokość zeskanowanego obrazu w pikselach"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nie można rozpocząć skanowania"
 
-#, 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 "Select File _Type"
-#~ msgstr "Proszę wybrać _typ pliku"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Proszę sprawdzić poprawność instalacji"
-
-#~ 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ł)"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Strona do skanowania"
-
-#~ msgid ""
-#~ "The height 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 "
-#~ "wykrywania papieru)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Wysokość papieru w dziesiątkach milimetrów"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Szerokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
-#~ "wykrywania papieru)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Szerokość papieru w dziesiątkach milimetrów"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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 "Wyświetla informację o wersji"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Wyświetla 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 za pomocą starszych wersji programu"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skanowanie się nie powiodło"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Trwa skanowanie"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[URZĄDZENIE…] — narzędzie do skanowania"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, 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"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Typ skanowanego dokumentu. To ustawienie decyduje o rozdzielczości "
-#~ "skanowania, kolorach i przetwarzaniu końcowym."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Strona kartki do skanowania."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Kierunek skanowania strony."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Wartość jakości używana do kompresji JPEG."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Dostosowanie kontrastu, od -100 do 100 (0 oznacza brak)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast skanowania"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Dostosowanie jasności, od -100 do 100 (0 oznacza brak)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Jasność skanowania"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Wartość jakości używana do kompresji JPEG"
-
-#~ 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)."
-
-#~ 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)."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Polecenie „%s --help” wyświetli pełną listę dostępnych opcji wiersza poleceń."
diff --git a/po/pt.gmo b/po/pt.gmo
deleted file mode 100644
index 47ee84d..0000000
--- a/po/pt.gmo
+++ /dev/null
diff --git a/po/pt.po b/po/pt.po
index 0ca5ddc..9f09628 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2015-09-22 09:45+0000\n"
 "Last-Translator: Ivo Xavier <ivoxavier.8@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nome do _utilizador para o recurso:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Palavra-passe:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Frente e verso"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Frente"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Verso"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Digitalização"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Digit_alizar"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "_Página única"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Todas as páginas a partir do _alimentador"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "_Parar digitalização"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Rodar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Rodar à _direita"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Cortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Rodar recorte"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Mover para a esquerda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Conteúdos"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "Digitalizar uma página no digitalizador"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Guardar documento num ficheiro"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Parar digitalização atual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rodar a página para a esquerda (contra ponteiros do relógio)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Rodar à esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rodar a página para a direita (ponteiros do relógio)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Rodar à direita"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Cortar a página selecionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Recortar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "Resolução do _texto:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Resolução da foto:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Lado da digitalização"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Tamanho da página:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Qualidade:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Scanner de documentos"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Digitalizar documentos"
 
@@ -308,7 +322,7 @@ msgstr "scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -319,7 +333,7 @@ msgstr ""
 "cortar e rodar. Pode imprimir as digitalizações, exportar para PDF, ou "
 "guardar em vários tipos de formatos de imagem."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -327,194 +341,205 @@ msgstr ""
 "atuais."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Sem digitalizador disponível. Por favor, ligue um scanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Impossível ligar ao scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Não é possível iniciar a digitalização"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Erro de comunicação com scanner"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: 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
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Imprimir mensagens de depuração"
 
-#: ../src/simple-scan.vala:26
+#: 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 "
 "Digitalizações"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Falhou ao digitalizar"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utilitário de digitalização"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Execute '%s --help' para consultar uma lista completa das opções de linha de "
 "comando disponíveis."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "Fechar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, 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.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Sem scanners detetados"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique se o seu scanner está conetado e ligado"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr "Software adicional necessário"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr "Precisa instalar o driver de software para o seu scanner."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "Guardar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Ficheiros de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-página)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "Formato do ficheiro:"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 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.vala:673
+#: src/ui.vala:721
 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.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "Guardar documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir a aplicação de visualização de imagem"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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.vala:1472
+#: src/ui.vala:1525
 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"
@@ -544,16 +569,16 @@ msgstr ""
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Acerca do Digitalizações (Simple Scan)"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -587,22 +612,22 @@ msgstr ""
 "  styluss https://launchpad.net/~styluss"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "Guardar documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Sair sem guardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr "Aparenta ter um scanner da Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -611,12 +636,12 @@ msgstr ""
 "href=\"http://support.brother.com\">Brother website</a>"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr "Aparentemente tem um digitalizador Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -625,17 +650,17 @@ msgstr ""
 "href=\"http://samsung.com/support\">Samsung website</a>"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr "Aparentemente tem um digitalizador HP"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr "Aparentemente tem um digitalizador Epson"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -644,139 +669,139 @@ msgstr ""
 "href=\"http://support.epson.com\">Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "Instalar drivers"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Uma vez instalado vai necessitar de re-iniciar a Digitalização Simples"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "A instalar drivers..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "Controladores instalados com sucesso!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Erro na instalação dos controladores (código de erro %d)"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr "Falhou a instalar os drivers."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Necessita de instalar o pacote(s) %s"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinido)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta-resolução)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Sair"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "_Instalar drivers"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Escurecer"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Clarear"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "A guardar o documento..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A guardar a página %d de %d"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
deleted file mode 100644
index baf2f40..0000000
--- a/po/pt_BR.gmo
+++ /dev/null
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b85e8c5..2849fbe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,515 +1,536 @@
 # Brazilian Portuguese translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2009-2017 THE simple-scan'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# Enrico Nicoletto <liverig@gmail.com>, 2017.
+# Fábio Nogueira <fnogueira@gnome.org>, 2017.
+# Isaac F. Ferreira Filho <isaacmob@riseup.net>, 2017.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 23:25+0000\n"
+"PO-Revision-Date: 2017-08-29 21:44-0300\n"
+"Last-Translator: Isaac F. Ferreira Filho <isaacmob@riseup.net>\n"
+"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizar"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositivo com o qual deve-se digitalizar"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nome de _usuário para o recurso:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositivo SANE a partir do qual deve-se adquirir imagens."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Senha:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipo do documento a ser digitalizado"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Frente e verso"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipo de documento a ser digitalizado. Esta configuração define a resolução "
+"da digitalização, cores e pós-processamento."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Frente"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Largura do papel em décimos de milímetro"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Verso"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+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:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"A altura do papel em décimos de milímetro (ou 0 para detecção automática de "
+"papel)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brilho da digitalização"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "O ajuste do brilho de -100 a 100 (0 sendo nenhum)."
 
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contraste da digitalização"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "O ajuste do contraste de -100 a 100 (0 sendo nenhum)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolução para digitalização de textos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"A resolução em pontos por polegada (dpi) a ser usada na digitalização e textos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolução para digitalização de fotos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"A resolução em pontos por polegadas (dpi) a ser usada na digitalização de fotos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Lado da página a ser digitalizado"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "O lado da página a ser digitalizado."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Diretório para salvar arquivos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Qualidade para usar na compressão JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Qualidade para usar na compressão JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Atraso em milissegundos entre as páginas"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Atraso em milissegundos entre as páginas."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "Digitalizador simples"
+msgstr "Digitalização simples"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Documento"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Digitalização de documentos"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Digit_alizar"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Uma forma realmente fácil de digitalizar tanto documentos como fotos. Você "
+"pode recortar as partes ruins de uma foto e fazer rotação, caso esteja do "
+"lado errado. Você pode imprimir as suas digitalizações, exportá-las em pdf "
+"ou salvá-las em uma variedade de formatos de imagem."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"O Digitalização simples usa o framework SANE para prover suporte à maioria "
+"dos scanners existentes."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Scanner de documentos"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"digitalizar;digitalizador;digitalização;vidro;alimentador;scan;scanner;scanner de mesa;scanner "
+"plano;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Página única"
 
+# Opção de alimentador manual, no qual é possível digitalizar várias páginas de uma só vez
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Todas as páginas do ali_mentador"
+msgstr "Todas as páginas a partir do ali_mentador"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Par_ar digitalização"
+# Opção de scanner manual, no vidro, no qual é possível inserir apenas uma página por vez
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiplas páginas a partir do vidro do scanner"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Documento"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Digit_alizar"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Par_ar digitalização"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Girar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Girar à di_reita"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "Re_cortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "_Ofício"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Gira_r área recortada"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mover para a esquerda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Iniciar um novo documento"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Novo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Digitalizar uma página no digitalizador"
+msgstr "Digitaliza uma única página no scanner"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Salvar documento em arquivo"
+msgstr "Salva o documento em um arquivo"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Salvar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
-msgstr "Parar a digitalização atual"
+msgstr "Interrompe a digitalização atual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Parar"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Girar a página à esquerda (sentido anti-horário)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Girar à esquerda"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Girar a página à direita (sentido horário)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Girar à direita"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recortar a página selecionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recortar"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferências"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Origem da digitalizaçã_o:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Resolução do _texto:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Procurando por scanners…"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Resolução da _foto:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Lado a digitalizar:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Tamanho da página:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brilho:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualidade:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Digitalizar documentos"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "Fe_char"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "É necessário o nome de usuário e senha para acessar “%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Pronto para digitalizar"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Necessário software adicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Nenhum digitalizador disponível. Por favor, conecte um digitalizador."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Não foi possível conectar-se ao digitalizador"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Não foi possível iniciar o digitalizador"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-msgid "Error communicating with scanner"
-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.vala:391
-msgid "Failed to scan"
-msgstr "Falha ao digitalizar"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIVO...] - Utilitário de digitalização"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Execute '%s --help' para ver a lista completa de opções disponíveis para "
-"linha de comando."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "Fe_char"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "É necessário o nome de usuário e senha para acessar '%s'"
+"Você precisa <a href=\"install-firmware\">instalar o software de driver</a> "
+"para o seu scanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Nenhum digitalizador detectado"
+msgstr "Nenhum scanner detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
-msgstr "Por favor verifique se o seu digitalizador está conectado e ligado"
-
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Por favor, verifique se o seu scanner está conectado e ligado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Salvar como..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Salvar como…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Salvar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Todos os arquivos"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento com múltiplas páginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimido)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Formato do arquivo:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressão:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Já existe um arquivo com o nome “%s”. Você deseja substituí-lo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "Subs_tituir"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Salvando"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
 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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
-msgstr "Salvar documento atual?"
+msgstr "Salvar o documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Contatando o scanner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Não é possível salvar imagem para visualização"
+msgstr "Não foi possível salvar imagem para visualização"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir o aplicativo de visualização de imagem"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
-msgstr "Combine os lados"
+msgstr "Combinar os lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr "Combine os lados (reverso)"
+msgstr "Combinar os lados (reverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr "Reverso"
+msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -539,19 +560,25 @@ msgstr ""
 "este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Sobre o Digitalizador simples"
+msgstr "Sobre o Digitalização simples"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
+"Tradutores do GNOME:\n"
+"  Enrico Nicoletto <liverig@gmail.com>.\n"
+"  Fábio Nogueira <fnogueira@gnome.org>.\n"
+"  Isaac F. Ferreira Filho <isaacmob@riseup.net>.\n"
+"  Rafael Fontenelle <rafaelff@gnome.org>.\n"
+"\n"
+"Tradutores do Launchpad:\n"
 "  André Gondim https://launchpad.net/~andregondim\n"
 "  Beatriz Vital https://launchpad.net/~vitalb\n"
 "  Benjamim Gois https://launchpad.net/~benjamim-gois\n"
@@ -577,192 +604,517 @@ msgstr ""
 "  millemiglia https://launchpad.net/~dnieper650"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Salvar o documento antes de sair?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Você parece ter um scanner da Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"Drivers para ele estão disponíveis no <a href=\"http://support.brother.com"
+"\">site da Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Você parece ter um scanner da Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"Drivers para ele estão disponíveis no <a href=\"http://samsung.com/support"
+"\">site da Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Você parece ter um scanner de HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Você parece ter um scanner de Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
+"Drivers para ele estão disponíveis no <a href=\"http://support.epson.com"
+"\">site da Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Instalar drivers"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
+"Assim que for instalado, você precisará reiniciar o Digitalização simples."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Instalando drivers…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Drivers instalados com sucesso!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Falha ao instalar drivers (código do erro %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Falha ao instalar drivers."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Você precisa instalar o pacote %s."
+msgstr[1] "Você precisa instalar os pacotes %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Atalhos de teclado"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Sobre"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Sair"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Começar novamente…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Gira a página à esquerda (sentido anti-horário)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Gira a página à direita (sentido horário)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Recorta a página selecionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Exclui a página selecionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nome de _usuário para o recurso:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Senha:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Não foi possível codificar a página %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Digitalização"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Digitaliza uma única página"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Digitaliza todas as páginas por um alimentador"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Digitaliza continuamente por vidro de scanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Interrompe a digitalização em andamento"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificação de documento"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Move a página para a esquerda"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Move a página para a direita"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Gira a página à esquerda (sentido anti-horário)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Gira a página à direita (sentido horário)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Exclui a página"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gerenciamento de documento"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Inicia um novo documento"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Salva o documento digitalizado"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Envia o documento digitalizado por e-mail"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprime o documento digitalizado"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copia a página atual para a área de transferência"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Scanner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Lados a digitalizar"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Tamanho da página"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Frente"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Verso"
+
+# Ambos lados, e não ambas páginas
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambos"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Atraso"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Múltiplas páginas a partir do vidro do scanner"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segundos"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Digitalização"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Resolução do _texto"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Resolução da _foto"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Brilho"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contraste"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualidade"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automático"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Mais escuro"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Mais claro"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menos"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Mais"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta resolução)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
-msgstr "%d ppp"
+msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Novo documento"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+"Nenhum scanner disponível. Por favor, conecte um scanner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Documentos"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Não foi possível conectar ao scanner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Não foi possível iniciar a digitalização"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimir..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Erro na comunicação com o scanner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Ajuda"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostra a versão de lançamento"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Sobre"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Imprime mensagens de depuração"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Sair"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Corrige arquivos PDF gerados em versões anteriores do Digitalização simples"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Falha ao digitalizar"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Alterar _digitalizador"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Digitalização em andamento"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIVO…] — Utilitário de digitalização"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
+"Execute “%s --help” para ver a lista completa de opções disponíveis para "
+"linha de comando."
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automático"
+#~ msgid "Front and Back"
+#~ msgstr "Frente e verso"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Mais escuro"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Mais claro"
+#~ msgid "Rotate Left"
+#~ msgstr "Girar à esquerda"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menos"
+#~ msgid "Rotate Right"
+#~ msgstr "Girar à direita"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Mais"
+#~ msgid "Crop"
+#~ msgstr "Recortar"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínima"
+#~ msgid "Scan S_ource:"
+#~ msgstr "Origem da digitalizaçã_o:"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Máxima"
+#~ msgid "New Document"
+#~ msgstr "Novo documento"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Salvando documento..."
+#~ msgid "Document"
+#~ msgstr "Documentos"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Salvando página %d de %d"
+#~ msgid "Email…"
+#~ msgstr "E-mail…"
+
+#~ msgid "Print…"
+#~ msgstr "Imprimir…"
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instalar drivers"
+
+#~ msgid "Minimum"
+#~ msgstr "Mínima"
+
+#~ msgid "Maximum"
+#~ msgstr "Máxima"
+
+#~ msgid "Saving document…"
+#~ msgstr "Salvando documento…"
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Salvando página %d de %d"
+
+#~ msgid "Email..."
+#~ msgstr "E-mail..."
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -770,7 +1122,6 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Por favor verifique a sua instalação"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -795,7 +1146,6 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Arquivos faltando"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -806,9 +1156,6 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Altura da imagem digitalizada em pixels"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolução para digitalização de fotos"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Altura da janela em pixels"
 
@@ -818,9 +1165,6 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Largura da imagem digitalizada em pixels"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolução para digitalização de textos"
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "A resolução em pontos por polegada da imagem previamente digitalizada."
@@ -835,19 +1179,17 @@ msgstr "Salvando página %d de %d"
 #~ "A altura da imagem digitalizada em pixels. Este valor é atualizado com o "
 #~ "valor da última página digitalizada."
 
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositivo de onde digitalizar"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Direção da 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'"
+#~ "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'"
+#~ "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 "
@@ -855,10 +1197,9 @@ msgstr "Salvando página %d de %d"
 #~ "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."
+#~ "'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"
@@ -877,97 +1218,22 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Selecionar _tipo de arquivo"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Documento digitalizado"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Diretório para salvar arquivos"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Altura do papel em décimos de milímetro"
-
 #~ 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)."
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "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 ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "A altura do papel em décimos de milímetro (ou 0 para detecção automática de "
-#~ "papel)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Largura do papel em décimos de milímetro"
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Tipo de documento a ser digitalizado. Esta configuração define a resolução "
-#~ "da digitalização, cores e pós-processamento."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipo do documento a ser digitalizado"
-
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADEIRO se a janela do aplicativo estiver maximizada"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositivo de onde o SANE adquirire imagens."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "A direção em que o digitalizador percorre a página digitalizada."
-
-#~ msgid "The page side to scan."
-#~ msgstr "O lado da página a ser digitalizado."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Lado da página a ser digitalizado"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "A resolução em pontos por polegada a ser usada na digitalização e textos."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "A resolução em pontos por polegadas a ser usada na digitalização de fotos."
-
-#~ 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."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "O ajuste do contraste de -100 para 100 (0 sendo nenhum)"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste do digitalizador"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "O ajuste de luminosidade de -100 para 100 (0 sendo nenhum)"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Luminosidade do digitalizador"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Qualidade para usar na compressão JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Qualidade para usar na compressão JPEG"
diff --git a/po/quot.sed b/po/quot.sed
deleted file mode 100644
index 0122c46..0000000
--- a/po/quot.sed
+++ /dev/null
@@ -1,6 +0,0 @@
-s/"\([^"]*\)"/“\1”/g
-s/`\([^`']*\)'/‘\1’/g
-s/ '\([^`']*\)' / ‘\1’ /g
-s/ '\([^`']*\)'$/ ‘\1’/g
-s/^'\([^`']*\)' /‘\1’ /g
-s/“”/""/g
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
deleted file mode 100644
index 2436c49..0000000
--- a/po/remove-potcdate.sin
+++ /dev/null
@@ -1,19 +0,0 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
-# from a POT file.
-#
-# The distinction between the first and the following occurrences of the
-# pattern is achieved by looking at the hold space.
-/^"POT-Creation-Date: .*"$/{
-x
-# Test if the hold space is empty.
-s/P/P/
-ta
-# Yes it was empty. First occurrence. Remove the line.
-g
-d
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}
diff --git a/po/ro.gmo b/po/ro.gmo
deleted file mode 100644
index 3a42394..0000000
--- a/po/ro.gmo
+++ /dev/null
diff --git a/po/ro.po b/po/ro.po
index 196a414..6c9bcec 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,297 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-09-11 18:43+0000\n"
-"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
+"PO-Revision-Date: 2017-03-29 06:32+0000\n"
+"Last-Translator: Angelescu <titus0818@yahoo.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: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizează"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Numele de _utilizator pentru resursă:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parolă:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Față și verso"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Față"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Verso"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Scanare simplă"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Sc_anează"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "O singură _pagină"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Toate paginile de la tava cu _foi de hârtie"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "Oprește _scanarea"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reordonare pagini"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Pagină"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Rotește la _stânga"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "De_cupează"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Niciunul"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Scrisoare"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Personalizat"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Rotește zona decupată"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Mută la stânga"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Mută la dreapta"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ajutor"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Cuprins"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Începeți un document nou"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Scanează"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Salvează documentul ca fișier"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Salvează"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Oprește scanarea curentă"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Oprește"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotește pagina la stânga (în sens invers acelor de ceasornic)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Rotește la stânga"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotește pagina la dreapta (în sensul acelor de ceasornic)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Rotește la dreapta"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Decupează pagina selectată"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Decupează"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferințe"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "S_ursă scanare:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "Rezoluție _text:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "Rezoluție _foto :"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Partea scanată:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Dimensiunea paginii:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Luminozitate:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Calitate:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Scanează documente"
 
@@ -309,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -317,200 +330,211 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 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.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Nu s-a putut realiza conexiunea la scaner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Nu s-a putut porni scanarea"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Eroare la comunicarea cu scanerul"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Arată versiunea"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Afișează mesajele pentru depanare"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Scanarea a eșuat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "DISPOZITIV...] - Utilitar pentru scanare"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Rulați „%s --help” pentru a consulta lista completă a opțiunilor pentru "
 "comenzile mediului text."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "Înc_hide"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, 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.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Nu a fost detectat niciun scaner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificați dacă scanerul este conectat și pornit"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Salvează ca..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Anulare"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Salvează"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Fișiere imagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Toate fișierele"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (document cu mai multe pagini)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (fără pierderi)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 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.vala:673
+#: src/ui.vala:721
 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.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "Salvați documentul curent?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Renunță la modificări"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
-msgstr ""
+msgstr "Combină fețele"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Combină fețeke (invers)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
-msgstr ""
+msgstr "Invers"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Păstrează nemodificat"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Nu se poate deschide fișierul de ajutor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -542,16 +566,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Despre „Scanare simplă”"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -565,189 +589,189 @@ msgstr ""
 "  sfantu https://launchpad.net/~sfantus1"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "Salvați documentul înainte de ieșire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (implicit)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezoluție înaltă)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
-msgstr ""
+msgstr "Document nou"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
-msgstr ""
+msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
-msgstr ""
+msgstr "Tipărire..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
-msgstr ""
+msgstr "Ajutor"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
-msgstr ""
+msgstr "Despre"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
-msgstr ""
+msgstr "Închide"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Mai întunecat"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Mai luminos"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Mai puțin"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Mai mult"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minim"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maxim"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Se salvează documentul..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Se salvează pagina %d din %d"
diff --git a/po/ru.gmo b/po/ru.gmo
deleted file mode 100644
index 2889b4c..0000000
--- a/po/ru.gmo
+++ /dev/null
diff --git a/po/ru.po b/po/ru.po
index 2752740..336c225 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,516 +2,525 @@
 # 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.
+# Stas Solovey <whats_up@tut.by>, 2017.
+# Роман Верменко <dargodet@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2015-11-01 17:49+0000\n"
-"Last-Translator: Sandro <Unknown>\n"
-"Language-Team: Russian <ru@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-19 11:56+0000\n"
+"PO-Revision-Date: 2017-08-20 21:07+0400\n"
+"Last-Translator: Yuri Myasoedov <ymyasoedov@yandex.ru>\n"
+"Language-Team: русский <>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Generator: Poedit 2.0.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Р_азрешить"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Устройство сканирования"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Имя поль_зователя для ресурса:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Устройство SANE для получения изображений."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Пароль:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Тип сканируемого документа"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Обе стороны"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Тип сканируемого документа. Эта настройка отвечает за разрешение, глубину "
+"цвета и пост-обработку."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Лицевая сторона"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Ширина бумаги  в сантиметрах"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Обратная сторона"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Высота бумаги в сантиметрах"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+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:35
+msgid "Brightness of scan"
+msgstr "Яркость изображения"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Значение яркости от -100 до 100 (0 — без изменений)."
 
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Контрастность изображения"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Значение контрастности от -100 до 100 (0 — без изменений)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Разрешение при сканировании текста"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Разрешение в точках на дюйм при сканировании текста."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Разрешение при сканировании фотографий"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Разрешение в точках на дюйм при сканировании фотографий."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Сторона страницы для сканирования"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Сторона страницы для сканирования."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Папка для сохранения файлов"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Папка для сохранения файлов. По умолчанию используется папка с документами."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Значение качества, используемого для сжатия JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Значение качества, используемого для сжатия JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Задержка в миллисекундах между страницами"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Задержка в миллисекундах между страницами."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Простое сканирование"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Документ"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Сканирование документов"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "_Сканировать"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Наиболее простой способ сканирования документов и фотографий. Вы можете "
+"обрезать испорченные края снимков и повернуть их, если расположили "
+"неправильно. Вы можете распечатать сканированные материалы, экспортировать "
+"их в PDF или изображения ряда форматов."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Простое сканирование использует фреймворк SANE для поддержки большинства "
+"существующих сканеров."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Сканер документов"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "сканировать;сканер;планшетный;автоподатчик;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Одна _страница"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Все страницы из _автоподатчика"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Остановить сканирование"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Несколько страниц с планшета"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Фотография"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Документ"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Сканировать"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Остановить сканирование"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Организация страниц"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "Отправить _почтой"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Повернуть в_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Повернуть в_право"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Обрезать"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Нет"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
-msgstr "_Другое..."
+msgstr "_Другое"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Повернуть выбранное"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Переместить влево"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Переместить вправо"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Справка"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Содержание"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Создать новый документ"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Создать"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "Сканировать одну страницу со сканера"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Сканировать"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Сохранить"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Прервать выполняемое сканирование"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
-msgstr "Завершить"
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Повернуть страницу влево (против часовой стрелки)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Повернуть влево"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Повернуть страницу вправо (по часовой стрелке)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Повернуть вправо"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Обрезать выбранную страницу"
+msgstr "Остановить"
 
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Обрезать"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Поиск сканеров…"
 
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Параметры"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Ист_очник сканирования:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Р_азрешение текста:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Разрешение фотографии:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Сканируемая сторона:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Размер листа:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Яркость:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Контрастность:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Качество:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Сканер документов"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Сканирование документов"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Закрыть"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "сканировать;сканер;планшетный;автоподатчик;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Требуется имя пользователя и пароль для доступа к «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Готово к сканированию"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Наиболее простой способ сканирования документов и фотографий. Вы можете "
-"обрезать испорченные края снимков и повернуть их, если расположили "
-"неправильно. Вы можете распечатать сканированные материалы, экспортировать "
-"их в PDF или изображения ряда форматов."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Необходимо дополнительное программное обеспечение"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Простое сканирование использует фреймворк SANE для поддержки большинства "
-"существующих сканеров."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Нет доступного сканера. Подключите его."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Не могу подключиться к сканеру"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Не могу начать сканирование"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Сканирование не удалось"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] — Устройство сканирования"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "Выполните '%s --help', чтобы вывести полный список доступных опций."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Закрыть"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Для доступа к '%s' нужны имя пользователя и пароль"
+"Необходимо <a href=\"install-firmware\">установить драйвер</a> для вашего "
+"сканера."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверьте, что сканер подсоединён и включён"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Необходимо дополнительно программное обеспечение"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Необходимо установить драйвер для вашего сканера."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Сохранить как..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Сохранить как…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "Со_хранить"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Файлы изображений"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Все файлы"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (многостраничный документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (сжатый)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (сжатый)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Формат файла:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Сжатие:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Файл с именем «%s» уже существует. Заменить его?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Заменить"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Сохранение"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Не удалось сохранить файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Соединение со сканером…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
-msgstr "Невозможно открыть программу для просмотра изображений"
+msgstr "Не удалось открыть программу для просмотра изображений"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Объединить стороны"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Объединить стороны (в обратном порядке)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "В обратном порядке"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Оставить без изменений"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -540,442 +549,477 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "О программе"
+msgstr "О приложении"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 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"
-"  Andrew Sudarikov https://launchpad.net/~andrey-interra\n"
-"  Andrew Yakush https://launchpad.net/~andyak77\n"
-"  Artem Popov https://launchpad.net/~artfwo\n"
-"  AsstZD https://launchpad.net/~eskaer-spamsink\n"
-"  Dmitry Shachnev https://launchpad.net/~mitya57\n"
-"  Dr Gregory House https://launchpad.net/~greghouse\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"
-"  KEIII https://launchpad.net/~cashagent\n"
-"  ManDrive https://launchpad.net/~roman-romul\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"
-"  Pavel Nazarov https://launchpad.net/~alsvartr\n"
-"  Sandro https://launchpad.net/~regipool\n"
-"  Sergey Loshakov https://launchpad.net/~sergeylo\n"
-"  Sergey Sedov https://launchpad.net/~serg-sedov\n"
-"  Simplehuman https://launchpad.net/~simplehuman\n"
-"  Stas Solovey 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"
-"  ned https://launchpad.net/~ru100\n"
-"  vasilisc https://launchpad.net/~vasilisc\n"
-"  Илья Калитко https://launchpad.net/~kalitko-ilya007\n"
-"  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
+"Stas Solovey <whats_up@tut.by>, 2015-2017\n"
+"Роман Верменко <dargodet@gmail.com>, 2017"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Похоже, у вас сканер компании Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Драйверы для этих сканеров доступны на <a "
-"href=\"http://support.brother.com\">веб-сайте Brother</a>."
+"Драйверы для этих сканеров доступны на <a href=\"http://support.brother.com"
+"\">веб-сайте Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Похоже, у вас сканер компании Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Драйверы для этих сканеров доступны на <a "
-"href=\"http://samsung.com/support\">веб-сайте Samsung</a>."
+"Драйверы для этих сканеров доступны на <a href=\"http://samsung.com/support"
+"\">веб-сайте Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Похоже, у вас сканер компании HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Похоже, у вас сканер компании Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Драйверы для этих сканеров доступны на <a "
-"href=\"http://support.epson.com\">веб-сайте Epson</a>."
+"Драйверы для этих сканеров доступны на <a href=\"http://support.epson.com"
+"\">веб-сайте Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Установка драйверов"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "После установки необходимо перезапустить Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Установка драйверов…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Драйверы успешно установлены!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не удалось установить драйверы (код ошибки %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Не удалось установить драйверы."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Необходимо установить пакет(-ы) %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Необходимо установить %s пакет"
+msgstr[1] "Необходимо установить %s пакета"
+msgstr[2] "Необходимо установить %s пакетов"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Параметры"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (по умолчанию)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Комбинации клавиш"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (черновик)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Справка"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (высокое разрешение)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "О программе"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Завершить"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Эл. почта"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Начать заново…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Повернуть страницу влево (против часовой стрелки)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Повернуть страницу вправо (по часовой стрелке)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Обрезать выбранную страницу"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Удалить выбранную страницу"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Отменить"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Р_азрешить"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Имя поль_зователя для ресурса:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+msgid "Unable to encode page %i"
+msgstr "Не удалось преобразовать страницу %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Сканирование"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Сканировать одну страницу"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Сканировать все страницы с устройства подачи документа"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Непрерывное сканирование с планшетного сканера"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Выполняется остановка сканирования"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Изменение документа"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Переместить страницу влево"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Переместить страницу вправо"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Повернуть страницу влево (против часовой стрелки)"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Новый документ"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Повернуть страницу вправо (по часовой стрелке)"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Документ"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Удалить страницу"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Отправить..."
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Управление документами"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Печать..."
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Создать новый документ"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Справка"
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Сохранить отсканированный документ"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "О программе"
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Отправить отсканированный документ по электронной почте"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Завершить"
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Напечатать отсканированный документ"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Копировать текущую страницу в буфер обмена"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Сменить _сканер"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Сканер"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Установить драйверы"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Сканируемые стороны"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Размер листа"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Лицевая сторона"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Обратная сторона"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Обе"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Задержка"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Несколько страниц с планшета"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Секунд"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Сканирование"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Р_азрешение текста"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Разрешение фотографии"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Яркость"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Контрастность"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Качество"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
-msgstr "Выбрать автоматически"
+msgstr "Автоматический"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Темнее"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Светлее"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Меньше"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Больше"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Мин."
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (по умолчанию)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Макс."
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (черновик)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Сохранение документа..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (высокое разрешение)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Сохранение страницы %d из %d"
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Нет доступных сканеров. Подключите сканер."
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Использование:\n"
-#~ "  %s [УСТРОЙСТВО...] - Инструмент для сканирования"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Не удалось подключиться к сканеру"
 
-#, 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 "Files missing"
-#~ msgstr "Файлы отсутствуют"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Пожалуйста, проверьте правильность установки программы"
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Высота отсканированного изображения в пикселах"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Устройство сканирования"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Папка для сохранения файлов"
-
-#~ msgid "Direction of scan"
-#~ msgstr "Направление сканирования"
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ 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 ""
-#~ "Направление сканирования. Возможны следующие варианты: 'top-to-bottom' "
-#~ "'bottom-to-top' 'left-to-right' 'right-to-left'"
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "TRUE, если окно приложения развёрнуто на весь экран"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Устройство SANE для получения изображений."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Разрешение для сканирования текста"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Разрешение для сканирования фотографий"
-
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr ""
-#~ "Разрешение в точках на дюйм предыдущего отсканированного изображения."
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Разрешение последнего отсканированного изображения"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Разрешение в точках на дюйм при сканировании фотографий."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Папка для сохранения файлов. По умолчанию используется папка с документами."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Тип сканируемого документа"
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Высота окна в пикселах"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Ширина окна в пикселах"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Не удалось начать сканирование"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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.vala:392
+msgid "Failed to scan"
+msgstr "Сканирование не удалось"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Выполняется сканирование"
 
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — Устройство сканирования"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, 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 width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Ширина отсканированного изображения в пикселах. Это значение обновляется при "
-#~ "каждом новом сканировании."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Разрешение в точках на дюйм при сканировании текста."
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Ширина отсканированного изображения в пикселах"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Отсканированный документ"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Выберите _тип файла"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Сторона страницы для сканирования. Может быть: 'с обоих сторон', 'лицевая', "
-#~ "'обратная'"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Сторона страницы для сканирования"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "Ширина бумаги в десятках мм (или 0 для автоматического определения)"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Высота бумаги в десятых долях мм"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Ширина бумаги, см"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Сторона страницы для сканирования."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Направление сканирования страницы."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Тип сканируемого документа. Эта настройка отвечает за разрешение, глубину "
-#~ "цвета и пост-обработку."
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "Высота бумаги в десятках мм (или 0 для автоматического определения)."
-
-#~ 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 ""
-#~ "Тип сканируемого документа. 'Текст' для текстовых документов, 'Фотография' "
-#~ "для фотографий. Выбор типа определяет разрешение, цвета и пост-обработку при "
-#~ "сканировании."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Значение яркости от -100 до 100 (0 — без изменений)."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Значение контрастности от -100 до 100 (0 — без изменений)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Контрастность изображения"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Яркость изображения"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Значение качества, используемого для сжатия JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Значение качества, используемого для сжатия JPEG"
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "Выполните «%s --help», чтобы вывести полный список доступных опций."
diff --git a/po/sd.gmo b/po/sd.gmo
deleted file mode 100644
index 932f4b7..0000000
--- a/po/sd.gmo
+++ /dev/null
diff --git a/po/sd.po b/po/sd.po
index b3a80fc..f6154b4 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: sd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_اجازت ڏيو"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_ڳجھو لفظ:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "اڳيون ۽ پويون"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "اڳيون"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "پوئتي"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "سادو اسڪين"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_دستاويز"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "_اسڪين"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "هڪڙو _صفحو"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "اسڪين _روڪيو"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "تحرير"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "فوٽو"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_ايميل"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_صفحو"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "_کاٻي ڦيرايو"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "_ساڄي ڦيرايو"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_ڪاٽيو"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_ڪوبه نه"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_مرضي مطابق"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "کاٻي چوريو"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "ساڄي چوريو"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_مدد"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_مواد"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "نئون دستاويز بنايو"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "نئون"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "اسڪينر مان هڪڙو صفحو اسڪين ڪريو"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "اسڪين"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "دستاويز کي فائل ۾ سانڍيو"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "سانڍيو"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "هلندڙ اسڪين روڪيو"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "روڪيو"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "کاٻي ڦيرايو"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "ساڄي ڦيرايو"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "چونڊيل صفحي کي ڪاٽيو"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "ڪاٽيو"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "ترجيحون"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "پاسو اسڪين ڪريو:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "صفحي جي ماپ:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "دستاويزات اسڪين ڪريو"
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "اسڪين ڪرڻ ۾ ناڪامي"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "هينئن سانڍيو..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "اسڪين دستاويز.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "شڪل فائلون"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "تمام فائلون"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "فائل سانڍڻ ۾ ناڪامي"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "هاڻوڪو دستاويز سانڍيو؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "تبديليون منسوخ ڪريو"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "سهڪاري فائل ڀرڻ ۾ ناڪام"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "سادي اسڪين بابت"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "سادو دستاويز اسڪين ڪندڙ اوزار"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "سانڍڻ بغير نڪرو"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "اسڪينر _تبديل ڪريو"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "پاڻمرادو"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/se.gmo b/po/se.gmo
deleted file mode 100644
index ac21c90..0000000
--- a/po/se.gmo
+++ /dev/null
diff --git a/po/se.po b/po/se.po
index 3b02cc3..a83f747 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: se\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Beassansátni:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Ovdabealli"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Maŋos"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Dokumeanta"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr ""
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Teaksta"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Fotografiija"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_E-boasta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Čuohpa"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Sirdde olgešguvlui"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Veahkki"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Ođđa"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Oza"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Vurke"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Bisset"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Jorat olgešguvlui"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Oidimat"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Vurke nugo …"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Buot fiillat"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Simple Scan-dieđut"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automáhtalaš"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/shn.gmo b/po/shn.gmo
deleted file mode 100644
index c0ac957..0000000
--- a/po/shn.gmo
+++ /dev/null
diff --git a/po/shn.po b/po/shn.po
index 051c5a6..5601070 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: shn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_မၵ်းမၼ်ႈၶႂၢင်းပၼ်"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "ႁူၼ်လင်"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr ""
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "လိၵ်ႈ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Rockworld https://launchpad.net/~rockrock2222222"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/simple-scan.pot b/po/simple-scan.pot
deleted file mode 100644
index a6f23dc..0000000
--- a/po/simple-scan.pot
+++ /dev/null
@@ -1,665 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Robert Ancell <robert.ancell@canonical.com>
-# This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: simple-scan 3.21.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr ""
-
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr ""
-
-#. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
-msgid "Simple Scan"
-msgstr ""
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr ""
-
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr ""
-
-#. Scan menu item to scan a single page from the scanner
-#. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
-msgid "Single _Page"
-msgstr ""
-
-#. Scan menu item to scan all pages from a document feeder
-#. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
-msgid "All Pages From _Feeder"
-msgstr ""
-
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr ""
-
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
-msgid "Text"
-msgstr ""
-
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
-msgid "Photo"
-msgstr ""
-
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
-msgid "Reorder Pages"
-msgstr ""
-
-#. Label on email menu item
-#: data/simple-scan.ui:367
-msgid "_Email"
-msgstr ""
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
-msgid "_Page"
-msgstr ""
-
-#. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
-msgid "Rotate _Left"
-msgstr ""
-
-#. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
-msgid "Rotate _Right"
-msgstr ""
-
-#. Label for page crop submenu
-#: data/simple-scan.ui:460
-msgid "_Crop"
-msgstr ""
-
-#. Radio button for no crop
-#: data/simple-scan.ui:470
-msgid "_None"
-msgstr ""
-
-#. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
-msgid "A_4"
-msgstr ""
-
-#. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
-msgid "A_5"
-msgstr ""
-
-#. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
-msgid "A_6"
-msgstr ""
-
-#. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
-msgid "_Letter"
-msgstr ""
-
-#. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
-msgid "Le_gal"
-msgstr ""
-
-#. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
-msgid "4×6"
-msgstr ""
-
-#. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
-msgid "_Custom"
-msgstr ""
-
-#. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
-msgid "_Rotate Crop"
-msgstr ""
-
-#. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
-msgid "Move Left"
-msgstr ""
-
-#. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
-msgid "Move Right"
-msgstr ""
-
-#. Label on help menu
-#: data/simple-scan.ui:624
-msgid "_Help"
-msgstr ""
-
-#. Help|Contents menu
-#: data/simple-scan.ui:632
-msgid "_Contents"
-msgstr ""
-
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr ""
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr ""
-
-#. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
-msgid "Scan a single page from the scanner"
-msgstr ""
-
-#. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
-msgid "Scan"
-msgstr ""
-
-#. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
-msgid "Save document to a file"
-msgstr ""
-
-#: data/simple-scan.ui:709 src/ui.vala:1842
-msgid "Save"
-msgstr ""
-
-#. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
-msgid "Stop the current scan"
-msgstr ""
-
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
-msgid "Stop"
-msgstr ""
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr ""
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr ""
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr ""
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr ""
-
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
-msgid "Preferences"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr ""
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr ""
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr ""
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr ""
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr ""
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr ""
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr ""
-
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:13
-msgid "Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
-#: src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr ""
-
-#: src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr ""
-
-#: src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr ""
-
-#: src/scanner.vala:1236 src/scanner.vala:1333
-msgid "Error communicating with scanner"
-msgstr ""
-
-#: src/simple-scan.vala:21
-msgid "Show release version"
-msgstr ""
-
-#: 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 ""
-
-#: src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr ""
-
-#: src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr ""
-
-#: src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-
-#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
-msgid "_Close"
-msgstr ""
-
-#: src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr ""
-
-#: src/ui.vala:375
-msgid "No scanners detected"
-msgstr ""
-
-#: src/ui.vala:377
-msgid "Please check your scanner is connected and powered on"
-msgstr ""
-
-#: src/ui.vala:382
-msgid "Additional software needed"
-msgstr ""
-
-#: src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr ""
-
-#: src/ui.vala:506 src/ui.vala:1843
-msgid "Save As..."
-msgstr ""
-
-#: src/ui.vala:509 src/ui.vala:675
-msgid "_Cancel"
-msgstr ""
-
-#: src/ui.vala:510 src/ui.vala:676
-msgid "_Save"
-msgstr ""
-
-#: src/ui.vala:516
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: src/ui.vala:521
-msgid "Image Files"
-msgstr ""
-
-#: src/ui.vala:527
-msgid "All Files"
-msgstr ""
-
-#: src/ui.vala:536
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#: src/ui.vala:542
-msgid "JPEG (compressed)"
-msgstr ""
-
-#: src/ui.vala:548
-msgid "PNG (lossless)"
-msgstr ""
-
-#: src/ui.vala:557
-msgid "File format:"
-msgstr ""
-
-#: src/ui.vala:650
-msgid "Failed to save file"
-msgstr ""
-
-#: src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr ""
-
-#: src/ui.vala:708
-msgid "Save current document?"
-msgstr ""
-
-#: src/ui.vala:710
-msgid "Discard Changes"
-msgstr ""
-
-#: src/ui.vala:992
-msgid "Unable to save image for preview"
-msgstr ""
-
-#: src/ui.vala:1004
-msgid "Unable to open image preview application"
-msgstr ""
-
-#: src/ui.vala:1206
-msgid "Combine sides"
-msgstr ""
-
-#: src/ui.vala:1216
-msgid "Combine sides (reverse)"
-msgstr ""
-
-#: src/ui.vala:1226
-msgid "Reverse"
-msgstr ""
-
-#: src/ui.vala:1236
-msgid "Keep unchanged"
-msgstr ""
-
-#: src/ui.vala:1451
-msgid "Unable to open help file"
-msgstr ""
-
-#: src/ui.vala:1472
-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 ""
-
-#: src/ui.vala:1475
-msgid "About Simple Scan"
-msgstr ""
-
-#: src/ui.vala:1478
-msgid "Simple document scanning tool"
-msgstr ""
-
-#: src/ui.vala:1487
-msgid "translator-credits"
-msgstr ""
-
-#: src/ui.vala:1509
-msgid "Save document before quitting?"
-msgstr ""
-
-#: src/ui.vala:1511
-msgid "Quit without Saving"
-msgstr ""
-
-#: src/ui.vala:1579
-msgid "You appear to have a Brother scanner."
-msgstr ""
-
-#: src/ui.vala:1581
-msgid ""
-"Drivers for this are available on the <a href=\"http://support.brother.com"
-"\">Brother website</a>."
-msgstr ""
-
-#: src/ui.vala:1585
-msgid "You appear to have a Samsung scanner."
-msgstr ""
-
-#: src/ui.vala:1587
-msgid ""
-"Drivers for this are available on the <a href=\"http://samsung.com/support"
-"\">Samsung website</a>."
-msgstr ""
-
-#: src/ui.vala:1591
-msgid "You appear to have an HP scanner."
-msgstr ""
-
-#: src/ui.vala:1596
-msgid "You appear to have an Epson scanner."
-msgstr ""
-
-#: src/ui.vala:1598
-msgid ""
-"Drivers for this are available on the <a href=\"http://support.epson.com"
-"\">Epson website</a>."
-msgstr ""
-
-#: src/ui.vala:1602
-msgid "Install drivers"
-msgstr ""
-
-#: src/ui.vala:1633
-msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
-
-#: src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
-
-#: src/ui.vala:1653
-msgid "Drivers installed successfully!"
-msgstr ""
-
-#: src/ui.vala:1663
-#, c-format
-msgid "Failed to install drivers (error code %d)."
-msgstr ""
-
-#: src/ui.vala:1669
-msgid "Failed to install drivers."
-msgstr ""
-
-#: src/ui.vala:1676
-#, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
-
-#: src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr ""
-
-#: src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr ""
-
-#: src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr ""
-
-#: src/ui.vala:1793
-#, c-format
-msgid "%d dpi"
-msgstr ""
-
-#: src/ui.vala:1835
-msgid "New Document"
-msgstr ""
-
-#: src/ui.vala:1840
-msgid "Document"
-msgstr ""
-
-#: src/ui.vala:1844
-msgid "Email..."
-msgstr ""
-
-#: src/ui.vala:1845
-msgid "Print..."
-msgstr ""
-
-#: src/ui.vala:1853
-msgid "Help"
-msgstr ""
-
-#: src/ui.vala:1854
-msgid "About"
-msgstr ""
-
-#: src/ui.vala:1855
-msgid "Quit"
-msgstr ""
-
-#: src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr ""
-
-#: src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr ""
-
-#: src/ui.vala:1897
-msgid "Automatic"
-msgstr ""
-
-#: src/ui.vala:1947
-msgid "Darker"
-msgstr ""
-
-#: src/ui.vala:1949
-msgid "Lighter"
-msgstr ""
-
-#: src/ui.vala:1957
-msgid "Less"
-msgstr ""
-
-#: src/ui.vala:1959
-msgid "More"
-msgstr ""
-
-#: src/ui.vala:1967
-msgid "Minimum"
-msgstr ""
-
-#: src/ui.vala:1969
-msgid "Maximum"
-msgstr ""
-
-#: src/ui.vala:2008
-msgid "Saving document..."
-msgstr ""
-
-#: src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr ""
diff --git a/po/sk.gmo b/po/sk.gmo
deleted file mode 100644
index 2b853f4..0000000
--- a/po/sk.gmo
+++ /dev/null
diff --git a/po/sk.po b/po/sk.po
index 41cb0eb..74b6601 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,518 +7,526 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-07-29 05:59+0000\n"
-"Last-Translator: Dusan Kazik <prescott66@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-18 18:03+0200\n"
+"Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
-"Language: sk\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Ove_riť"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Zariadenie z ktorého skenovať"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Užívateľské meno pre zdroj:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Zariadenie SANE z ktorého získať obrázky."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Heslo:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Druh dokumentu ktorý sa skenuje"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Predná a zadná strana"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"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."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Predná strana"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Šírka papiera v desatinách mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Zadná strana"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Šírka papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
+"papiera)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Výška papiera v desatinách mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Výška papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
+"papiera)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Jas skenu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Úprava jasu od -100 do 100 (0 znamená bez úpravy)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast skenu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Úprava kontrastu od -100 do 100 (0 znamená bez úpravy)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Rozlíšenie pre skenovanie textu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní textu."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Rozlíšenie pre skenovanie fotografií"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní "
+"fotografií."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Strana stránky na skenovanie"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Strana stránky, ktorá sa má naskenovať."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Adresár na ukladanie súborov"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Adresár, do ktorého sa majú ukladať súbory. Ak je nenastavený, použije sa "
+"predvolený adresár dokumentov."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Hodnota kvality komprimácie obrázkov JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Hodnota kvality, ktorá sa má použiť pre komprimáciu obrázkov JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Oneskorenie medzi stránkami v milisekundách"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Oneskorenie medzi stránkami v milisekundách."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Jednoduché skenovanie"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenuje dokumenty"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "_Skenovať"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Skutočne jednoduchý spôsob ako naskenovať dokumenty aj fotografie. Môžete "
+"orezať nevhodné časti fotografie a otočiť ich podľa potreby. Vaše oskenované "
+"dokumenty môžete vytlačiť, exportovať ich do pdf, alebo ich uložiť v rôznych "
+"formátoch obrázkov."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Aplikácia Jednoduché skenovanie využíva rozhranie SANE, kvôli podpore "
+"väčšiny existujúcich skenerov."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skener dokumentov"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skenovanie;skenovať;skener;plochý;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Jedna stránka"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "_Všetky stránky z podávača"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Zastaviť skenovanie"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Viacero stránok z plochého skenera"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografia"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Skenovať"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zastaviť skenovanie"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Zmeniť poradie stránok"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Otočiť _doľava"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Otočiť do_prava"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Orezanie"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "Žia_dne"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "US _List"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Vlastné"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Otočiť výrez"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Presunúť doľava"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Presunúť doprava"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Pomocník"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Obsah"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Vytvorí nový dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nový"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Oskenuje jednu stránku zo skeneru"
+msgstr "Naskenuje jednu stránku zo skeneru"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skenovať"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Uloží dokument do súboru"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Uložiť"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zastaví aktuálne skenovanie"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zastaviť"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Otočí stránku doľava (v protismere hodinových ručičiek)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Otočiť doľava"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Vyhľadávajú sa skenery…"
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Otočí stránku doprava (v smere hodinových ručičiek)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Otočiť doprava"
-
-# tooltip
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Oreže vybratú stránku"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Orezanie"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Nastavenia"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Zdroj s_kenovania:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Rozlíšenie _textu:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Rozlíšenie _fotografií:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skenovaná strana:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Veľkosť stránky:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Jas:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalita:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Skener dokumentov"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skenuje dokumenty"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Zavrieť"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skenovanie;skenovať;skener;plochý;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, 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“"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "skener"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Skenovanie pripravené"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Skutočne jednoduchý spôsob ako oskenovať dokumenty aj fotografie. Môžete "
-"orezať nevhodné časti fotografie a otočiť ich podľa potreby. Vaše oskenované "
-"dokumenty môžete vytlačiť, exportovať ich do pdf, alebo ich uložiť v rôznych "
-"formátoch obrázkov."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Vyžaduje sa dodatočný softvér"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Aplikácia Jednoduché skenovanie využíva rozhranie SANE, kvôli podpore "
-"väčšiny existujúcich skenerov."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Nie sú dostupné žiadne skenery. Prosím, pripojte skener."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Nie je možné pripojiť sa ku skeneru"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Nie je možné začať skenovať"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Skenovanie zlyhalo"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ZARIADENIE…] - Nástroj na skenovanie"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
-"--help“."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Zavrieť"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, 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'"
+"Musíte <a href=\"install-firmware\">nainštalovať softvér ovládača</a> pre "
+"váš skener."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nezistili sa žiadne skenery"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím, skontrolujte, či je skener pripojený a zapnutý"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Vyžaduje sa dodatočný softvér"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Musíte nainštalovať softvér ovládača pre váš skener."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Uložiť ako..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Uloženie ako…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "Z_rušiť"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Uložiť"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Súbory obrázkov"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Všetky súbory"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument s viacerými stránkami)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratový)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimovaný)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Formát súboru:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimácia:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Súbor s názvom „%s“ už existuje. Chcete ho nahradiť?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Nahradiť"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Ukladá sa"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Ukladanie súboru zlyhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
 msgstr "Ak dokument neuložíte, zmeny budú natrvalo stratené."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Uložiť aktuálny dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Zahodiť zmeny"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktuje sa skener…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Nie je možné otvoriť aplikáciu na náhľad obrázku"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinovať strany"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinovať strany (obrátene)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Obrátiť"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Ponechať nezmenené"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Nie je možné otvoriť súbor pomocníka"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -548,19 +556,19 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
+"Prispievatelia zo služby Launchpad:\n"
 "  6205 https://launchpad.net/~6205-reactivated-deactivatedaccount\n"
 "  Alessio Treglia https://launchpad.net/~quadrispro\n"
 "  Dusan Kazik https://launchpad.net/~prescott66\n"
@@ -570,201 +578,517 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Uložiť dokument pred ukončením?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Ukončiť bez uloženia"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Zdá sa, že máte skener značky Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com/g/b/countrytop.aspx?c=cz&lang=cs\">Brother "
-"website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com/g/"
+"b/countrytop.aspx?c=cz&lang=cs\">Brother website</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Zdá sa, že máte skener značky Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/sk/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/sk/support"
+"\">Samsung website</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Zdá sa, že máte skener značky HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Zdá sa, že máte skener značky Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Ovládače pre tento skener sú dostupné na <a "
-"href=\"http://www.epson.sk/sk/sk/viewcon/corporatesite/support\">webovej "
-"stránke výrobcu Epson</a>."
+"Ovládače pre tento skener sú dostupné na <a href=\"http://www.epson.sk/sk/sk/"
+"viewcon/corporatesite/support\">webovej stránke výrobcu Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Inštalácia ovládačov"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Po inštalácii budete musieť aplikáciu Jednoduché skenovanie reštartovať."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Inštalujú sa ovládače..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Inštalujú sa ovládače…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Ovládače boli úspešne nainštalované!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Zlyhala inštalácia ovládačov (kód chyby %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Zlyhala inštalácia ovládačov."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Musíte nainštalovať balík(y) %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Musíte nainštalovať balík %s."
+msgstr[1] "Musíte nainštalovať balíky %s."
+msgstr[2] "Musíte nainštalovať balíky %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Nastavenia"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Klávesové skratky"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Pomocník"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programe"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Ukončiť"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Email"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Začať odznovu…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Otočí stránku doľava (v protismere hodinových ručičiek)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Otočí stránku doprava (v smere hodinových ručičiek)"
+
+# tooltip
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Oreže vybranú stránku"
+
+# tooltip
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Odstráni vybranú stránku"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Ove_riť"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Užívateľské meno pre zdroj:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Nie je možné dekódovať stránku č. %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skenovanie"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Naskenovanie jednej stránky"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Naskenovanie všetkých stránok z podávača dokumentov"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Priebežné skenovanie z plochého skeneru"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zastavenie prebiehajúceho skenovania"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Úprava dokumentov"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Presun stránky doľava"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Presun stránky doprava"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Otočenie stránky doľava (v protismere hodinových ručičiek)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Otočenie stránky doprava (v smere hodinových ručičiek)"
+
+# tooltip
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Odstránenie stránky"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Správa dokumentov"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Zahájenie nového dokumentu"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Uloženie naskenovaného dokumentu"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Odoslanie naskenovaného dokumentu emailom"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Tlač naskenovaného dokumentu"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Skopírovanie aktuálne stránky do schránky"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skener"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skenované strany"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Veľkosť stránky"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Predná strana"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Zadná strana"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obe"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Oneskorenie"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Viacero stránok z plochého skenera"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "sekúnd"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skenovanie"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Rozlíšenie _textu"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Rozlíšenie _fotografií"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Jas"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalita"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatická"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tmavší"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Svetlejší"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menší"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Väčší"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predvolené)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (koncept)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlíšenie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nový dokument"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nie sú dostupné žiadne skenery. Prosím, pripojte skener."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nie je možné pripojiť sa ku skeneru"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Email..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nie je možné začať skenovať"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Tlačiť..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Chyba v komunikácii so skenerom"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Pomocník"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Zobrazí verziu vydania"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "O programe"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Vypíše správy ladenia"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Ukončiť"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Zmeniť _skener"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skenovanie zlyhalo"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "Na_inštalovať ovládače"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Prebieha skenovanie"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatická"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ZARIADENIE…] — Nástroj na skenovanie"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Tmavší"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
+"--help“."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Svetlejší"
+#~ msgid "Front and Back"
+#~ msgstr "Predná a zadná strana"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menší"
+#~ msgid "New"
+#~ msgstr "Nový"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Väčší"
+#~ msgid "Rotate Left"
+#~ msgstr "Otočiť doľava"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimálna"
+#~ msgid "Rotate Right"
+#~ msgstr "Otočiť doprava"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximálna"
+#~ msgid "Crop"
+#~ msgstr "Orezanie"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Ukladá sa dokument…"
+#~ msgid "Scan S_ource:"
+#~ msgstr "Zdroj s_kenovania:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Ukladá sa %d. stránka z %d"
+#~ msgid "New Document"
+#~ msgstr "Nový dokument"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Email..."
+#~ msgstr "Email..."
+
+#~ msgid "Print..."
+#~ msgstr "Tlačiť..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "Na_inštalovať ovládače"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimálna"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximálna"
+
+#~ msgid "Saving document..."
+#~ msgstr "Ukladá sa dokument…"
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Ukladá sa %d. stránka z %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -776,24 +1100,17 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ msgstr "Chýbajúce súbory"
 
 #~ 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'"
+#~ "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"
-#~ msgstr "Druh dokumentu ktorý sa skenuje"
+#~ "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 "TRUE if the application window is maximized"
 #~ msgstr "TRUE pokiaľ je aplikačné okno v maximálnej veľkosti"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Zariadenie z ktorého skenovať"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Zariadenie SANE z ktorého získať obrázky."
-
 #~ msgid "Direction of scan"
 #~ msgstr "Smer skenovania"
 
@@ -802,9 +1119,9 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ "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."
+#~ "Druh dokumentu ktorý sa skenuje. 'text' pre textové dokumenty, 'photo' "
+#~ "pre fotografie. Táto hodnota určuje rozlíšenie skenovania, farby a "
+#~ "koncové spracovanie."
 
 #~ msgid "Window height in pixels"
 #~ msgstr "Výška okna v pixeloch"
@@ -813,8 +1130,8 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ msgstr "Šírka okna v pixeloch"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
@@ -826,7 +1143,6 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ "Výška skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
 #~ "skenovanej stránky."
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -842,7 +1158,6 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ "  --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"
@@ -850,7 +1165,6 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ "Použitie:\n"
 #~ "  %s [ZARIADENIE...] - Skenovacia pomôcka"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -876,83 +1190,5 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Šírka skenovaného obrázku v pixeloch"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Rozlíšenie pre skenovanie fotografií"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Rozlíšenie pre skenovanie textu"
-
-#~ msgid ""
-#~ "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."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast skenu"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Jas skenu"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Šírka papiera v desatinách mm"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Šírka papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
-#~ "papiera)"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Výška papiera v desatinách mm"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Výška papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
-#~ "papiera)"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Úprava jasu od -100 do 100 (0 znamená bez úpravy)"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Úprava kontrastu od -100 do 100 (0 znamená bez úpravy)"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní textu."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní "
-#~ "fotografií."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Strana stránky na skenovanie"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Strana stránky, ktorá sa má oskenovať."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Adresár na ukladanie súborov"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Adresár, do ktorého sa majú ukladať súbory. Ak je nenastavený, použije sa "
-#~ "predvolený adresár dokumentov."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Hodnota kvality kompresie obrázkov JPEG"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Hodnota kvality, ktorá sa má použiť pre kompresiu obrázkov JPEG."
-
-#~ msgid "Scanned Document"
-#~ msgstr "Oskenovaný dokument"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Vybrať _typ súboru"
diff --git a/po/sl.gmo b/po/sl.gmo
deleted file mode 100644
index d0a23ee..0000000
--- a/po/sl.gmo
+++ /dev/null
diff --git a/po/sl.po b/po/sl.po
index 01af45d..84e9f97 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,518 +1,528 @@
 # Slovenian 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.
+#
+# Matej Urbančič <mateju@svn.gnome.org>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 09:19+0000\n"
-"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-28 19:45+0200\n"
+"PO-Revision-Date: 2017-08-28 20:14+0200\n"
+"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Generator: Poedit 2.0.1\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Pooblasti"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Naprava za optično branje"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Uporabniško ime za vir:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Naprava SANE za pridobivanje slik."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Geslo:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Vrsta optično branega dokumenta"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Vrsta dokumenta za optično branje. Ta nastavitev določi ločljivost tiskanja, "
+"barve in poobdelovo."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Prednja in hrbtna stran"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Širina papirja v desetinkah milimetra"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Prednja stran"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Hrbtna stran"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Višina papirja v desetinkah milimetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Višina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje "
+"papirja)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Svetlost optičnega branja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+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:40
+msgid "Contrast of scan"
+msgstr "Kontrast optičnega branja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Ločljivost za optično branje besedil"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Ločljivost za optično branje fotografij"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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:55
+msgid "Page side to scan"
+msgstr "Stran strani za optično branje"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Stran strani za optično branje."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Mapa za shranjevanje datotek"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Vrednost kakovosti za stiskanje JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Vrednost kakovosti za stiskanje JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Zakasnitev med branjem strani v milisekundah"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Zakasnitev med branjem strani v milisekundah."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Enostavno optično branje"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Optično preberi dokumente"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Op_tično branje"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Zelo enostaven način za optično branje tako dokumentov kot fotografij. "
+"Posamezne dele fotografije je mogoče obrezati in fotografijo zavrteti, če je "
+"napačno obrnjena. Prebrane dokumente je nato mogoče natisniti, izvoziti v "
+"datoteke PDF ali shraniti v enega od podprtih zapisov."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Enostavno optično branje zahteva ogrodje SANE, s katerim bo omogočena "
+"podpora večine optičnih bralnikov."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Optični bralnik dokumentov"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "optični bralnik;adf;podajalnik;skener;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Ena _stran"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Vse strani iz _podajalnika"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Zaustavi optično branje"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Več strani z namiznim optičnim bralnikom"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Besedilo"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografija"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Op_tično branje"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zaustavi optično branje"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Prerazporeditev strani"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
-msgstr "_Elektronska pošta"
+msgstr "_Elektronski naslov"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Stran"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Obreži"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Brez"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr "Velikost ZDA Le_gal"
+msgstr "Podaljšana stran"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Po meri"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
-msgstr "_Zavrti obrezovano območje"
+msgstr "_Zavrti obrezano polje"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Premakni levo"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Premakni desno"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "Pomo_č"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Začni nov dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Novo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Optično branje"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Shrani"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno optično branje"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zaustavi"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Zavrti levo"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Poteka iskanje optičnega bralnika ..."
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Obrni stran v desno (smer urinega kazalca)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Zavrti desno"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Obreži izbrano stran"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Obreži"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Možnosti"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Vir optičnega branja:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Ločljivost besedila:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Ločljivost fotografij:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Stran optičnega branja:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Velikost strani:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Svetlost:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kakovost:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Optični bralnik dokumentov"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Optično preberite dokumente"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Zapri"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "optični bralnik;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Za dostop do »%s« sta zahtevana uporabniško ime in geslo"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Naprava je pripravljena za optično branje"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Zelo enostaven način za optično branje tako dokumentov kot fotografij. Slabe "
-"dele fotografije lahko obrežete in fotografijo zavrtite, če je obrnjena. "
-"Prebrane dokumente lahko natisnete, izvozite v pdf ali shranite v eno od "
-"mnogih oblik."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Zahtevana je dodatna programska oprema"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Enostavno optično branje zahteva ogrodje SANE, da lahko podpira večino "
-"obstoječih optičnih bralnikov."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-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.vala:1223
-msgid "Unable to start scan"
-msgstr "Optičnega branja ni mogoče začeti"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Popravi datoteke PDF ustvarjene s starejšimi različicami programa Simple Scan"
-
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "Optično branje je spodletelo"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-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:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Zapri"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Za dostop do '%s' je zahtevano uporabniško ime in geslo"
+"Za optični bralnik je treba <a href=\"install-firmware\">namestiti "
+"programski gonilnik</a>."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Optičnega bralnika ni mogoče zaznati"
+msgstr "Ni zaznanega optičnega bralnika"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
-msgstr "Preverite, če je vaš optični bralnik povezan in vklopljen"
-
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Potrebna je dodatna programska oprema"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Za svoj optični bralnik morate namestiti gonilnik."
+msgstr "Preverite, ali je optični bralnik priklopljen in vklopljen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Shrani kot ..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Shrani"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr "Optično bran dokument.pdf"
+msgstr "Optično prebran dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Vse datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (stisnjen)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Vrsta datoteke:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Stiskanje:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Datoteka z imenom »%s« že obstaja. Ali jo želite zamenjati?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Zamenjaj"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Poteka shranjevanje"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Shranjevanje datoteke je spodletelo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
-msgstr "Naj bo trenutni dokument shranjen?"
+msgstr "Ali želite dokument shraniti?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
-msgstr "Zavrzi vse spremembe"
+msgstr "Zavrzi spremembe"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Poteka povezovanje optičnega bralnika ..."
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Ni bilo mogoče shraniti slike za predogled"
+msgstr "Ni mogoče shraniti slike za predogled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Spoji strani"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Spoji strani (obratno)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Obrnjeno"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Ohrani nespremenjeno"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -539,229 +549,541 @@ msgstr ""
 "zagotovila za PRODAJO ali PRIMERNOST ZA DOLOČEN NAMEN. \n"
 "Oglejte si GNU General Public Licence za več podrobnosti.\n"
 "\n"
-"Skupaj s programom bi morali prejeti tudi kopijo splošnega javnega potrdila; "
-"\n"
+"Skupaj s programom bi morali prejeti tudi kopijo splošnega javnega "
+"potrdila; \n"
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "O programu"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Matej Urbančič <mateju@svn@gnome.org>\n"
 "Launchpad Contributions:\n"
-"  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic\n"
-"  Damir Jerovšek https://launchpad.net/~jierro\n"
-"  Dražen Matešić https://launchpad.net/~crazylemon\n"
-"  Klemen Košir https://launchpad.net/~klemen.kosir\n"
-"  Martin Srebotnjak https://launchpad.net/~miles\n"
-"  Peter Klofutar https://launchpad.net/~peter-klofutar\n"
-"  Robert Hrovat https://launchpad.net/~robi-hipnos\n"
-"  Sasa Batistic https://launchpad.net/~sasa-batistic\n"
-"  grofaty https://launchpad.net/~grofaty"
+"  Andrej Žnidaršič\n"
+"  Damir Jerovšek\n"
+"  Dražen Matešić\n"
+"  Klemen Košir\n"
+"  Martin Srebotnjak\n"
+"  Peter Klofutar\n"
+"  Robert Hrovat\n"
+"  Saša Batistič\n"
+"  grofaty"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
-msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
+msgstr "Ali želite dokument končanjem programa shraniti?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Videti je, da imate optični bralnik Brother."
+msgstr "Videti je, da je priklopljen optični bralnik Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Za ta optični bralnik so gonilniki na voljo na  <a "
-"href=\"http://support.brother.com\">spletni strani Brother</a>."
+"Gonilniki so na voljo na spletišču podjetja <a href=\"http://support.brother."
+"com\">Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Videti je, da imate optični bralnik Samsung."
+msgstr "Videti je, da je priklopljen optični bralnik Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Za ta optični bralnik so gonilniki na voljo na  <a "
-"href=\"http://samsung.com/support\">spletni strani Samsung</a>."
+"Gonilniki so na voljo na spletišču podjetja <a href=\"http://samsung.com/"
+"support\">Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Videti je, da imate optični bralnik HP."
+msgstr "Videti je, da je priklopljen optični bralnik HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Videti je, da imate optični bralnik Epson."
+msgstr "Videti je, da je priklopljen optični bralnik Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Gonilniki za to so na voljo na <a "
-"href=\"http://support.epson.com\">spletišču Epson</a>."
+"Gonilniki so na voljo na spletišču podjetja <a href=\"http://support.epson."
+"com\">Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Namesti gonilnike"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
-"Ko se namestijo, boste morali program Enostavno optično branje ponovno "
-"zagnati."
+msgstr "Ko bodo paketi nameščeni, je treba program ponovno zagnati."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Nameščanje gonilnikov ..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr "Gonilniki uspešno nameščeni!"
+msgstr "Gonilniki so uspešno nameščeni!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Namestitev gonilnikov je spodletela (koda napake %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Namestitev gonilnikov je spodletela."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Namestiti je treba %s paketov."
+msgstr[1] "Namestiti je treba %s paket."
+msgstr[2] "Namestiti je treba %s paketa."
+msgstr[3] "Namestiti je treba %s pakete."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Možnosti"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tipkovne bližnjice"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Pomoč"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programu"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Izhod"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Elektronski naslov"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Začni znova ..."
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Obrni stran v desno (smer urinega kazalca)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Obreži izbrano stran"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Izbriši izbrano stran"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Pooblasti"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Uporabniško ime za vir:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Geslo:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Morate namestiti paket(e) %s."
+msgid "Unable to encode page %i"
+msgstr "Ni mogoče kodirati strani %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Poteka optično branje"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Optično preberi eno stran"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Zaporedno optično branje iz podajalnika dokumentov"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Zaporedno optično branje z namiznim bralnikom"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zaustavi trenutno optično branje"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Spremembe dokumenta"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Premakni stran levo"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Premakni stran desno"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Obrni stran v desno (smer urinega kazalca)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Izbriši stran"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Upravljanje dokumentov"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Začni nov dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Shrani optično prebran dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Pošlji optično prebran dokument"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Natisni optično prebran dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiraj trenutno stran v odložišče"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Optični bralnik"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Branje nasprotnih strani"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Velikost strani"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Prednja stran"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Hrbtna stran"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obe strani"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Zakasnitev"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Več strani z namiznim optičnim bralnikom"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunde"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Optično branje"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Ločljivost besedila"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Ločljivost fotografije"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Svetlost"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kakovost"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Samodejno"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Temenjše"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Svetlejše"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Manj"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Več"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nov dokument"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Ni zaznanega optičnega bralnika. Priklopite in vklopite ga."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Z optičnim bralnikom se ni mogoče povezati"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-pošta ..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Optičnega branja ni mogoče začeti"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Natisni ..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Napaka med povezovanjem optičnim bralnikom"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Pomoč"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Pokaži podrobnosti različice"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "O programu"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Izpiši sporočila razhroščevanja"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Izhod"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Spremeni _optični bralnik"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Optično branje je spodletelo"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Namesti gonilnike"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Poteka optično branje dokumenta"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Samodejno"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[NAPRAVA ...] – orodje za optično branje"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Temenjše"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+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:1949
-msgid "Lighter"
-msgstr "Svetlejše"
+#~ msgid "Front and Back"
+#~ msgstr "Prednja in hrbtna stran"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Manj"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Več"
+#~ msgid "Rotate Left"
+#~ msgstr "Zavrti levo"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Najmanj"
+#~ msgid "Rotate Right"
+#~ msgstr "Zavrti desno"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Največ"
+#~ msgid "Crop"
+#~ msgstr "Obreži"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Shranjevanje dokumenta ..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Vir optičnega bralnika:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Shranjevanje strani %d od %d"
+#~ msgid "New Document"
+#~ msgstr "Nov dokument"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Email..."
+#~ msgstr "Elektronska pošta ..."
+
+#~ msgid "Print..."
+#~ msgstr "Natisni ..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Namesti gonilnike"
+
+#~ msgid "Minimum"
+#~ msgstr "Najmanj"
+
+#~ msgid "Maximum"
+#~ msgstr "Največ"
+
+#~ msgid "Saving document..."
+#~ msgstr "Shranjevanje dokumenta ..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Shranjevanje strani %d od %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -772,16 +1094,12 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "PRAV, če je okno programa razpeto"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Naprava SANE za pridobivanje slik."
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Višina okna v točkah"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Širina okna v točkah"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -801,53 +1119,15 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgstr "Izberite _vrsto datoteke"
 
 #~ 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."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Mapa za shranjevanje datotek"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Višina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje "
-#~ "papirja)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Višina papirja v desetinkah milimetra"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Širina papirja v desetinkah milimetra"
-
-#~ 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)."
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "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 "Page side to scan"
-#~ msgstr "Stran strani za optično branje"
+#~ "Stran strani za optično branje. Lahko je eno od naslednjega: 'obe' "
+#~ "'spredaj' 'zadaj'"
 
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Višina optično prebrane slike v točkah"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Ločljivost za optično branje fotografij"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Ločljivost za optično branje besedil"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Naprava za optično branje"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Smer optičnega branja"
 
@@ -855,32 +1135,24 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgstr "Ločljivost zadnjega optičnega branja"
 
 #~ 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'"
+#~ "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'"
+#~ "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 ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Višina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
-#~ "zadnje optično prebrane strani."
+#~ "Višina optično brane slike v točkah. Ta vrednost je posodobljena na "
+#~ "vrednost zadnje optično prebrane strani."
 
 #~ 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)"
 
-#~ 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)"
-
-#~ 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)"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Vrsta optično branega dokumenta"
-
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -891,16 +1163,15 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "branja, barve in nadaljnje obdvelovanje"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
+#~ "Širina optično brane slike v točkah. Ta vrednost je posodobljena na "
+#~ "vrednost zadnje optično brane strani."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Širina optično brane slike v točkah"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -908,7 +1179,6 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "Uporaba:\n"
 #~ "  %s [NAPRAVA ...] - Pripomoček optičnega branja"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -928,39 +1198,8 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "  --gtk-module=MODULES Naloži dodatnemodule GTK+\n"
 #~ "  --g-fatal-warnings Naredi vsa opozorila usodna"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Optično bran dokument"
-
 #~ msgid "Please check your installation"
 #~ msgstr "Preverite svojo namestitev"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Stran strani za optično branje."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Vrsta dokumenta za optično branje. Ta nastavitev določi ločljivost tiskanja, "
-#~ "barve in poobdelovo."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Smer optičnega bralnika na optično brani strani."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Prilagoditev kontrasta od -100 do 100 (0 kot brez)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast optičnega branja"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Prilagoditev svetlosti od -100 do 100 (0 kot brez)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Svetlost optičnega branja"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Vrednost kakovosti za stiskanje JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Vrednost kakovosti za stiskanje JPEG"
diff --git a/po/sq.gmo b/po/sq.gmo
deleted file mode 100644
index 215a9ff..0000000
--- a/po/sq.gmo
+++ /dev/null
diff --git a/po/sq.po b/po/sq.po
index 1674e47..0b7213a 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizo"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Emri i përdoruesit për resursin:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Fjalëkalimi:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Para dhe Mbrapa"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Përball"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Mbrapa"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Skanim i thjeshtë"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Dokumenti"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "Sk_anim"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "Faqe e _vetme"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Të Gjitha Faqet Nga _Ushqyesi"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "_Ndalo Skanimin"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Riorganizo faqet"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Faqe"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Rrotullo _Majtas"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Rrotullo _Djathtas"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Prije"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Asnjë"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letër SHBA"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Sipas përdoruesit"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Prerje me Rrotullim"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Lëvize Majtas"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Lëvize Djathtas"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ndihmë"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Përmbajtje"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Filloje një dokument të ri"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "I ri"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Skanim"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Ruaje dokumentin tek një fajll"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Ruaj"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Ndaloje skanimin e tanishëm"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Ndalo"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rrotulloje faqen majtas (kundër akrepave të orës)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Rrotullo Majtas"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rrotullo faqen në të djathtë"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Rrotullo Djathtas"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Preje faqen e përzgjedhur"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Prej"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Skanoje b_urimin"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Rezolucioni i Tekstit:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Rezolucioni i Fotos:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Skanoje anën"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Përmasa e Faqes:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Ndriçimi:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Cilësia:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skanoj Dokumentet"
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,201 +330,212 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nuk ka skanera të disponueshëm. Ju lutemi të lidhni një skaner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Nuk jemi në gjendje të lidhim një skaner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Nuk munda të nis skanimin"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Gabim gjatë komunikimit me skanerin"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: 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
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Printo mesazhet e gabimeve"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Skanimi dështoi"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Mjet i skanimit"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 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."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "_Mbylle"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Emri i përdoruesit dhe skanimi kërkohet për të hyrë në '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Nuk u dalluan skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ju lutemi të kontrolloni nëse skaneri juaj është i lidhur dhe i ndezur"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
-msgstr ""
+msgstr "Kërkohet program shtesë"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Ju duhet të instaloni një program draiveri për skanerin tuaj."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Anullo"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Ruaje"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Dokumenti i Skanuar.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Kartela Pamje"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Të Gjithë Skedarët"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument shumë faqësh)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (i ngjeshur)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (pa humbje)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "Formati i skedarit:"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "Dështuam në ruajtjen e skedarit"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
 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.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "Ta ruaj dokumentin e tanishëm?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Anullo Ndryshimet"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Nuk jam në gjendje të hap programin për parapamjen e imazhit"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
-msgstr ""
+msgstr "Kombino anët"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Kombino anët (mbrapsht)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Mbrapsht"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Mbaje të pandryshuar"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "E pamundur hapja e file të ndihmës"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -539,16 +564,16 @@ msgstr ""
 "me këtë program. Nëse jo, shikoni <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Rreth Skanimit të Thjeshtë"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Mjet i thjeshtë për skanimin e dokumenteve"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -558,189 +583,195 @@ msgstr ""
 "  Vilson Gjeci https://launchpad.net/~vilsongjeci"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "Ta ruaj dokumentin para daljes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Dil pa e ruajtur"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Duket se ju keni një skaner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
+"Draiverat për të janë të disponueshëm në <a "
+"href=\"http://support.brother.com\"> Faqen e internetit të Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Duket se ju keni një skaner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
+"Draiverat për të janë të disponueshëm në <a "
+"href=\"http://samsung.com/support\">Faqen e internetit të Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Duket se ju keni një skaner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Duket se ju keni një skaner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"Draiverat për të janë të disponueshëm në <a "
+"href=\"http://support.epson.com\">Faqen e internetit të Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
-msgstr ""
+msgstr "Instalo draiverat"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Pas instalimit ju duhet të rinisni Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Instalim i draiverave..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Draiverat u instaluan me sukses!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Dështoi instalimi i draiverave (kodi i gabimit %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Dështoi instalimi i draiverave."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "Ju duhet të instaloni %s paketa."
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (e parazgjedhur)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (i thjeshtë)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezolucion i lartë)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Dokument i ri"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Printo..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Ndihmë"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Rreth"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Dil"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Ndrysho _Skanerin"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "_Instalo Draiverat"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Më e Errët"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Më e lehtë"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Më Pak"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Më tepër"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Ruajtje e dokumentit..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ruajtja e faqes %d nga %d"
diff --git a/po/sr.gmo b/po/sr.gmo
deleted file mode 100644
index 9a2c205..0000000
--- a/po/sr.gmo
+++ /dev/null
diff --git a/po/sr.po b/po/sr.po
index 3bbd5ed..2364af0 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,517 +2,529 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2016.
+# Борисав Живановић <borisavzivanovic@gmail.com>, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-02-08 06:49+0000\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <gnom@prevod.org>\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-15 20:17+0000\n"
+"PO-Revision-Date: 2017-08-06 13:06+0200\n"
+"Last-Translator: Борисав Живановић <borisavzivanovic@gmail.com>\n"
+"Language-Team: Serbian\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
-"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.3\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Овласти"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Уређај за скенирање"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Корисничко име за извор:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "САНЕ уређај за стварање слика."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Лозинка:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Врста скенираног документа"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Лице и позадина"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Врста документа који се скенира. Ово подешавање утиче на резолуцију, боје и "
+"накнадну обраду."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Лице"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Ширина папира у десетим деловима милиметра"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Позадина"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Висина папира у десетим деловима милиметра"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+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:35
+msgid "Brightness of scan"
+msgstr "Осветљеност приликом скенирања"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Подешавање осветљености од -100 до 100 (0 за никакво осветљење)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Контраст приликом скенирања"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Подешавање контраста од -100 до 100 (0 за без контраста)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Резолуција скенирања текста"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Резолуција у тачкама по инчу за пробно скенирање."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Резолуција скенирања слика"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Резолуција у тачкама по инчу за скенирање слика."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Страна папира за скенирање"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Страна папира за скенирање."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Директоријум за чување датотека"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Директоријум за чување датотека. Подразумевана локација је директоријум за "
+"документе."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Квалитет ЈПЕГ компресије"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Квалитет ЈПЕГ компресије."
 
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Размак у милисекундама између страница"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Размак у милисекундама између страница."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "Обично скенирање"
+msgstr "Једноставно cкенирање"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Документ"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Скенирајте документе"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "С_кенирај"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Веома једноставан начин за скенирање докумената и слика. Можете исећи лоше "
+"делове слике и ротирати је ако је окренута на погрешну страну. Можете "
+"штампати скениране датотеке, сачувати их у формату ПДФ или у великом избору "
+"осталих формата."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Једноставно Скенирање користи САНЕ фрејмворк као подршку за велики број "
+"скенера."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Скенер за документе"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"scan;scanner;flatbed;adf;скенирање;скенер;копирање;skeniranje;skener;"
+"kopiranje;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
-msgstr "Једну _страницу"
+msgstr "_Једонострано"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Све странице из _фиоке"
+msgstr "Све странице из _фиоке скенера"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Заустави скенирање"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Више страница са положеног скенера"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Слика"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Документ"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Скенирај"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Заустави скенирање"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
-msgstr "Промени ред страница"
+msgstr "Промените распоред страница"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
-msgstr "_Ел. пошта"
+msgstr "_Е-пошта"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
-msgstr "_Страница"
+msgstr "Ст_раница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
-msgstr "Окрени на _лево"
+msgstr "Ротирај на_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
-msgstr "Окрени на _десно"
+msgstr "Ротирај на_десно"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
-msgstr "_Опсеци"
+msgstr "_Исеци"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ништа"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
-msgstr "А_4"
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
-msgstr "А_5"
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
-msgstr "А_6"
+msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
-msgstr "_Америчко писмо"
+msgstr "_Писмо"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr "_Легал"
+msgstr "_УС легал"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Произвољно"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
-msgstr "_Заокрени опсечено"
+msgstr "Ро_тирај исечак"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
-msgstr "Помери улево"
+msgstr "Помери налево"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
-msgstr "Помери удесно"
+msgstr "Помери надесно"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
-msgstr "По_моћ"
+msgstr "_Помоћ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
-msgstr "_Садржај"
-
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Покрените нови документ"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Ново"
+msgstr "Садр_жај"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Скенирајте једну страницу са скенера"
+msgstr "Скенирај једну стану са скенера"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Скенирај"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Сачувајте документ у датотеку"
+msgstr "Сачувај документ у датотеку"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Сачувај"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
-msgstr "Зауставите текуће скенирање"
+msgstr "Заустави скенирање"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Заустави"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Окрените страницу на лево (супротно смеру казаљке на сату)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Окрени на лево"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Окрените страницу на десно (у смеру казаљке на сату)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Окрени на десно"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Одрежите изабрану страницу"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Одрежи"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Поставке"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Извор скенирања:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Резолуција _текста:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Резолуција _слике:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Странице за скенирање:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Величина странице:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Тражење скенера…"
 
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Осветљај:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Контраст:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Квалитет:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Скенер докумената"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Скенирајте документе"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Затвори"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "скенирај;скенер;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Име налога и лозинка који су потребни за приступ “%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Спреман за скенирање"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Једноставно решење за лако скенирање докумената и слика. Можете отсећи лоше "
-"делове слика и окренути скенирано. Можете штампати скенирано, одрадити извоз "
-"у ПДФ или сачувати скенирано у један од мноштва подржаних формата слика."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Потребан је додатни софтвер"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Обично скенирање користи САНЕ радни оквир да би додатно подржао већину "
-"тренутних скенера."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Нема доступних скенера.  Прикључите скенер."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Не могу да се повежем са скенером"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Не могу да започнем скенирање"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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:391
-msgid "Failed to scan"
-msgstr "Нисам успео да скенирам"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[УРЕЂАЈ...] — алатка за скенирање"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Покрените „%s --help“ за потпуни списак свих опција из командне линије."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Затвори"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Корисничко име и лозинка су обавезни за приступ „%s“"
+"Морате да <a href=\"install-firmware\">инсталирате управљачки програм</a> за "
+"Ваш скенер."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Нема откривених скенера"
+msgstr "Ниједан скенер није пронађен"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
-msgstr "Проверите да ли је скенер повезан и укључен"
-
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Потребан је додатни софтвер"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Морате да инсталирате управљачке програме за ваш скенер."
+msgstr "Провери да ли је скенер повезан и укључен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Сачувај као..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Сачувај као…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Сачувај"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Датотеке слика"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Све датотеке"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "ПДФ (документ са више страна)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr "ЈПЕГ (сажето)"
+msgstr "ЈПЕГ (компримовани)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "ВебП (компримовани)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr "Запис датотеке:"
+msgstr "Формат датотеке:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Компресија:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Датотека са називом “%s” већ постоји.  Да ли желите да је замените?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Замени"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Чување"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
-msgstr "Нисам успео да сачувам датотеку"
+msgstr "Чување датотеке није успело"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Уколико не сачувате, измене ће бити трајно изгубљене."
+#: src/app-window.vala:550
+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:708
+#: src/app-window.vala:591
 msgid "Save current document?"
-msgstr "Да сачувам текући документ?"
+msgstr "Сачувати тренутни документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Контактирање скенера…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Не могу да сачувам слику за преглед"
+msgstr "Чување пробне слике није успело"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
-msgstr "Не могу да отворим програм за приказивање слика"
+msgstr "Покретање програма за приказ слике није успело"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
-msgstr "Обједини стране"
+msgstr "Комбинуј странице"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr "Обједини стране (преокрени)"
+msgstr "Комбинуј странице (уназад)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr "Преокрени"
+msgstr "Изокрени"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
-msgstr "Задржи неизмењено"
+msgstr "Без измена"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
-msgstr "Не могу да отворим датотеку помоћи"
+msgstr "Није могуће отворити датотеку помоћи"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -527,31 +539,30 @@ 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"
-"уз овај програм. Ако нисте, погледајте:\n"
-"http://www.gnu.org/licenses/."
+"Требало би да сте добили копију ГНУ-ове Опште јавне лиценце\n"
+"уз овај програм. Ако нисте посетите <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "О Једноставном скенирању"
+msgstr "О програму Једноставно Скенирање"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -560,409 +571,470 @@ msgstr ""
 "  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"
+"  Мирослав Николић https://launchpad.net/~lipek\n"
+"Serbian GNOME Translation Project:\n"
+"  Борисав Живановић <borisavzivanovic@gmail.com>"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
-msgstr "Изађи без чувања"
+msgstr "Затвори без чувања"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Изгледа да имате Бродеров скенер."
+msgstr "Изгледа да имате Брадеров скенер."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Управљачки програми су доступни на <a "
-"href=\"http://support.brother.com\">веб сајту Бродера</a>."
+"Управљачки програми се налазе на  <a href=\"http://support.brother.com"
+"\">вебсајту Брадера</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Изгледа да имате Самсунгов скенер."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Управљачки програми су доступни на <a "
-"href=\"http://samsung.com/support\">веб сајту Самсунга</a>."
+"Управљачки програми се налазе на  <a href=\"http://samsung.com/support"
+"\">вебсајту Самсунга</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Изгледа да имате Хевлет-Пакардов скенер."
+msgstr "Изгледа да имате ХП-ов скенер."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Изгледа да имате Епсонов скенер."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Управљачки програми су доступни на <a href=\"http://support.epson.com\">веб "
-"сајту Епсона</a>."
+"Управљачки програми се налазе на  <a href=\"http://support.epson.com"
+"\">вебсајту Епсона</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr "Инсталација управљачких програма"
+msgstr "Инталирај управљачки програм"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
-"Након инсталације мораћете поново да покренете Једноставно скенирање."
+"Када инсталирате управљачки програм морате поново покренути Једноставно "
+"Скенирање."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Инсталирам управљачке програме..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Инсталација управљачког програма у току…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr "Управљачки програми су успешно инсталирани!"
+msgstr "Управљачки програм успешно инсталиран!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Нисам успео да инсталирам управљачке програме (грешка %d)."
+msgstr "Инсталација управљачког програма није успела (код грешке  %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr "Нисам успео да инсталирам управљачке програме."
+msgstr "Инсталација управљачког програма није успела."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Треба да инсталирате пакет „%s“."
-
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d тпи (основно)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d тпи (нацрт)"
-
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d тпи (висока резолуција)"
-
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
-#, c-format
-msgid "%d dpi"
-msgstr "%d тпи"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Нови документ"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Документ"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Ел. пошта..."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Морате инсталирати %s пакет"
+msgstr[1] "Морате инсталирати %s пакетa"
+msgstr[2] "Морате инсталирати %s пакетa"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Поставке"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Штампај..."
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Пречице на тастатури"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "О програму"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
-msgstr "Изађи"
+msgstr "Излаз"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Промени _скенер"
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Е-пошта"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Инсталирај управљачке програме"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "_Поново покрени…"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Самостално"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Ротирај страницу налево (супротно казаљци на сату)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Тамније"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Ротирај страницу надесно (смер казаљке на сату)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Светлије"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Исеци означену страницу"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Мањи"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Обриши означену страницу"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Већи"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Откажи"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Најнижи"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Дај _приступ"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Највиши"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Корисничко име:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Чувам документ..."
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Шифра:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Чувам %d. страницу од укупно %d"
+msgid "Unable to encode page %i"
+msgstr "Кодирање странице %i није могуће"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Скенирање"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Скенирање једне странице"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Скенирање свих страница из фијоке"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Скенирање без прекида са положеног скенера"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Прекид текућег скенирања"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Измена документа"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Померање станице налево"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Померање станице надесно"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Ротирање странице налево (супротно казаљци на сату)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Ротирање странице надесно (смер казаљке на сату)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Брисање странице"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Управљање документима"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Прављење новог документа"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Чување скенираног документа"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Слање скенираног документа е-поштом"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Штампање скенираног документа"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Копирање тренутне странице на оставу"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Скенер"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Проверите вашу инсталацију"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Странице за скенирање"
 
-#~ msgid "Files missing"
-#~ msgstr "Недостају датотеке"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Величина странице"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Предња страна"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Правац скенирања"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Задња страна"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Обе стране"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Временски размак"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Више страна са положеног скенера"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "секунди"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Скенирање"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Резолуција последње скениране слике"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Резолуција _текста"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Резолуција у тачкама-по-инчу (dpi) претходно скениране слике."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Резолуција _слике"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Резолуција за скенирања слика"
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Осветљење"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Резолуција за скенирања текста"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Контраст"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Директоријум за чување датотека"
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Квалитет"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Скенирани документ"
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Аутоматски"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Страна странице за скенирање"
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Тамније"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Висина папира у десетом делу милиметра"
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Светлије"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Висина скениране слике у тачкама"
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Мање"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "ТАЧНО ако је прозор програма увећан"
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Више"
 
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Усмерење скенера преко скениране странице."
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d тачака по инчу (подразумевано)"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Директоријум у коме ће бити сачуване датотеке. Ако није постављено онда је "
-#~ "то основни директоријум докумената."
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d тачака по инчу (белешка)"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Страна странице за скенирање."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d тачака по инчу (висока резолуција)"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Врста документа који ће бити скениран"
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d тачака по инчу"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Врста документа који ће бити скениран. Ово подешавање одлучује о резолуцији, "
-#~ "бојама и завршној обради скенирања."
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Ниједан скенер није доступан. Повежи скенер."
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Ширина папира у десетом делу милиметра"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Није могуће контактирати скенер"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Ширина скениране слике у тачкама"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Није могуће почети скенирање"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Висина прозора у тачкама"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Грешка у комуникацији са скенером"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Ширина прозора у тачкама"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+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 ""
-#~ "Усмерење скенера преко скениране странице. Може бити једна од следећих "
-#~ "вредности: „top-to-bottom“ (одозго-на-доле), „bottom-to-top“ (одоздо-на-"
-#~ "горе), „left-to-right“ (слева-на-десно) или „right-to-left“ (сдесна-на-лево)."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Испиши поруке за дебаговање"
 
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Страна странице за скенирање. Може бити једна од следећих вредности: „both“ "
-#~ "(обе), „front“ (наличје) или „back“ (позадина)."
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+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 ""
-#~ "Врста документа који ће бити скениран. „text“ (текст) за документа, „photo“ "
-#~ "(фотографија) за фотографије. Ово подешавање одлучује о резолуцији, бојама и "
-#~ "завршној обради скенирања."
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Скенирање није успело"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Коришћење:\n"
-#~ "  %s [УРЕЂАЈ...] — алатка за скенирање"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+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                      Приказује Гтк+ опције"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[УРЕЂАЈ…] — Алат за скенирање"
 
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, 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              Чини сва упозорења кобним"
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Ширина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
-#~ "величину последње скениране странице."
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Висина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
-#~ "величину последње скениране странице."
-
-#~ msgid "Device to scan from"
-#~ msgstr "Уређај са ког ће се скенирати"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "САНЕ уређај са ког ће се унети слике."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Ширина папира у десетом делу милиметра (или 0 за самостално откривање "
-#~ "папира)."
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Висина папира у десетом делу милиметра (или 0 за самостално откривање "
-#~ "папира)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Осветљај скенирања"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Контраст скенирања"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Вредност квалитета за ЈПЕГ сажимање"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Вредност квалитета која ће се користити за ЈПЕГ сажимање."
-
-#~ msgid "Select File _Type"
-#~ msgstr "_Изабери врсту датотеке"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Дотеривање осветљаја од -100 до 100 (0 значи ништа)."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Дотеривање контраста од -100 до 100 (0 значи ништа)."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
-#~ "текста."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
-#~ "фотографија."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Покрените “%s --help” да бисте видели листу свих опција командне линије."
diff --git a/po/sr@latin.po b/po/sr@latin.po
new file mode 100644
index 0000000..7d8df05
--- /dev/null
+++ b/po/sr@latin.po
@@ -0,0 +1,1040 @@
+# 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.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2016.
+# Borisav Živanović <borisavzivanovic@gmail.com>, 2017.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-15 20:17+0000\n"
+"PO-Revision-Date: 2017-08-06 13:06+0200\n"
+"Last-Translator: Borisav Živanović <borisavzivanovic@gmail.com>\n"
+"Language-Team: Serbian\n"
+"Language: sr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.3\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Uređaj za skeniranje"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE uređaj za stvaranje slika."
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Vrsta skeniranog dokumenta"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Vrsta dokumenta koji se skenira. Ovo podešavanje utiče na rezoluciju, boje i "
+"naknadnu obradu."
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Širina papira u desetim delovima milimetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Širina papira u desetim delovima milimetra (uneti 0 za automatsko "
+"prepoznavanje papira)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Visina papira u desetim delovima milimetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Visina papira u desetim delovima milimetra (uneti 0 za automatsko "
+"prepoznavanje papira)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Osvetljenost prilikom skeniranja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Podešavanje osvetljenosti od -100 do 100 (0 za nikakvo osvetljenje)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast prilikom skeniranja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Podešavanje kontrasta od -100 do 100 (0 za bez kontrasta)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Rezolucija skeniranja teksta"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Rezolucija u tačkama po inču za probno skeniranje."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Rezolucija skeniranja slika"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Rezolucija u tačkama po inču za skeniranje slika."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Strana papira za skeniranje"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Strana papira za skeniranje."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Direktorijum za čuvanje datoteka"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Direktorijum za čuvanje datoteka. Podrazumevana lokacija je direktorijum za "
+"dokumente."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitet JPEG kompresije"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitet JPEG kompresije."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Razmak u milisekundama između stranica"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Razmak u milisekundama između stranica."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
+msgid "Simple Scan"
+msgstr "Jednostavno ckeniranje"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenirajte dokumente"
+
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Veoma jednostavan način za skeniranje dokumenata i slika. Možete iseći loše "
+"delove slike i rotirati je ako je okrenuta na pogrešnu stranu. Možete "
+"štampati skenirane datoteke, sačuvati ih u formatu PDF ili u velikom izboru "
+"ostalih formata."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Jednostavno Skeniranje koristi SANE frejmvork kao podršku za veliki broj "
+"skenera."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skener za dokumente"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"scan;scanner;flatbed;adf;skeniranje;skener;kopiranje;skeniranje;skener;"
+"kopiranje;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+msgid "Single _Page"
+msgstr "_Jedonostrano"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+msgid "All Pages From _Feeder"
+msgstr "Sve stranice iz _fioke skenera"
+
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Više stranica sa položenog skenera"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+msgid "Text"
+msgstr "Tekst"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+msgid "Photo"
+msgstr "Slika"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Skeniraj"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zaustavi skeniranje"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+msgid "Reorder Pages"
+msgstr "Promenite raspored stranica"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "_E-pošta"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "St_ranica"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "Rotiraj na_levo"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "Rotiraj na_desno"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "_Iseci"
+
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "_Ništa"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+msgid "_Letter"
+msgstr "_Pismo"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+msgid "Le_gal"
+msgstr "_US legal"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+msgid "4×6"
+msgstr "4×6"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:397
+msgid "_Custom"
+msgstr "_Proizvoljno"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:415
+msgid "_Rotate Crop"
+msgstr "Ro_tiraj isečak"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:428
+msgid "Move Left"
+msgstr "Pomeri nalevo"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:437
+msgid "Move Right"
+msgstr "Pomeri nadesno"
+
+#. Label on help menu
+#: src/app-window.ui:474
+msgid "_Help"
+msgstr "_Pomoć"
+
+#. Help|Contents menu
+#: src/app-window.ui:482
+msgid "_Contents"
+msgstr "Sadr_žaj"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:520 src/app-window.ui:720
+msgid "Scan a single page from the scanner"
+msgstr "Skeniraj jednu stanu sa skenera"
+
+#. Label on scan toolbar item
+#: src/app-window.ui:522 src/app-window.ui:716
+msgid "Scan"
+msgstr "Skeniraj"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:538 src/app-window.ui:787
+msgid "Save document to a file"
+msgstr "Sačuvaj dokument u datoteku"
+
+#: src/app-window.ui:540
+msgid "Save"
+msgstr "Sačuvaj"
+
+#. Tooltip for stop button
+#: src/app-window.ui:555 src/app-window.ui:700
+msgid "Stop the current scan"
+msgstr "Zaustavi skeniranje"
+
+#: src/app-window.ui:556 src/app-window.ui:697
+msgid "Stop"
+msgstr "Zaustavi"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Traženje skenera…"
+
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Zatvori"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Ime naloga i lozinka koji su potrebni za pristup “%s”"
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Spreman za skeniranje"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Potreban je dodatni softver"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+"Morate da <a href=\"install-firmware\">instalirate upravljački program</a> za "
+"Vaš skener."
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:281
+msgid "No scanners detected"
+msgstr "Nijedan skener nije pronađen"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:283
+msgid "Please check your scanner is connected and powered on"
+msgstr "Proveri da li je skener povezan i uključen"
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Sačuvaj kao…"
+
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#: src/app-window.vala:302 src/app-window.vala:553
+msgid "_Save"
+msgstr "_Sačuvaj"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:310
+msgid "Scanned Document.pdf"
+msgstr "Skenirani dokument.pdf"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
+msgid "Image Files"
+msgstr "Datoteke slika"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:326
+msgid "All Files"
+msgstr "Sve datoteke"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:335
+msgid "PDF (multi-page document)"
+msgstr "PDF (dokument sa više strana)"
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:341
+msgid "JPEG (compressed)"
+msgstr "JPEG (komprimovani)"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:347
+msgid "PNG (lossless)"
+msgstr "PNG (bez gubitaka)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "VebP (komprimovani)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
+msgid "File format:"
+msgstr "Format datoteke:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Kompresija:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Datoteka sa nazivom “%s” već postoji.  Da li želite da je zamenite?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Zameni"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Čuvanje"
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:527
+msgid "Failed to save file"
+msgstr "Čuvanje datoteke nije uspelo"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Ako ne sačuvate izmene će biti izgubljene zauvek."
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:591
+msgid "Save current document?"
+msgstr "Sačuvati trenutni dokument?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:593
+msgid "Discard Changes"
+msgstr "Odbaci izmene"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktiranje skenera…"
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:800
+msgid "Unable to save image for preview"
+msgstr "Čuvanje probne slike nije uspelo"
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:812
+msgid "Unable to open image preview application"
+msgstr "Pokretanje programa za prikaz slike nije uspelo"
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:990
+msgid "Combine sides"
+msgstr "Kombinuj stranice"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1000
+msgid "Combine sides (reverse)"
+msgstr "Kombinuj stranice (unazad)"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1010
+msgid "Reverse"
+msgstr "Izokreni"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1020
+msgid "Keep unchanged"
+msgstr "Bez izmena"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1250
+msgid "Unable to open help file"
+msgstr "Nije moguće otvoriti datoteku pomoći"
+
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1271
+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 ""
+"Ovaj pogram je slobodan softver: možete ga deliti i/ili modifikovati\n"
+"pod uslovima GNU-ove Opšte javne licence koju je objavila\n"
+"Zadužbina za Slobodan Softver, verzija 3 ili\n"
+"po vašoj želji bilo koja starija verzija.\n"
+"\n"
+"Ovaj program je dostupan u nadi da će biti koristan,\n"
+"ali BEZ BILO KAKVE GARANCIJE; čak i bez pretpostavljene garancije\n"
+"na MOGUĆNOST PRODAJE i SLUŽENJA NAMENI. Pogledajte\n"
+"GNU-ovu Opštu javnu licencu za više detalja.\n"
+"\n"
+"Trebalo bi da ste dobili kopiju GNU-ove Opšte javne licence\n"
+"uz ovaj program. Ako niste posetite <http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: src/app-window.vala:1274
+msgid "About Simple Scan"
+msgstr "O programu Jednostavno Skeniranje"
+
+#. Description of program
+#: src/app-window.vala:1277
+msgid "Simple document scanning tool"
+msgstr "Jednostavna alatka za skeniranje dokumenata"
+
+#: src/app-window.vala:1286
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  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"
+"  Marko M. Kostić https://launchpad.net/~marko-m-kostic\n"
+"  Miroslav Nikolić https://launchpad.net/~lipek\n"
+"Serbian GNOME Translation Project:\n"
+"  Borisav Živanović <borisavzivanovic@gmail.com>"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1308
+msgid "Save document before quitting?"
+msgstr "Da sačuvam dokument pre nego što izađem?"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
+msgid "Quit without Saving"
+msgstr "Zatvori bez čuvanja"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1357
+msgid "You appear to have a Brother scanner."
+msgstr "Izgleda da imate Braderov skener."
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1359
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+"Upravljački programi se nalaze na  <a href=\"http://support.brother.com"
+"\">vebsajtu Bradera</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: src/app-window.vala:1363
+msgid "You appear to have a Samsung scanner."
+msgstr "Izgleda da imate Samsungov skener."
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1365
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+"Upravljački programi se nalaze na  <a href=\"http://samsung.com/support"
+"\">vebsajtu Samsunga</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: src/app-window.vala:1369
+msgid "You appear to have an HP scanner."
+msgstr "Izgleda da imate HP-ov skener."
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have an Epson scanner."
+msgstr "Izgleda da imate Epsonov skener."
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1376
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+"Upravljački programi se nalaze na  <a href=\"http://support.epson.com"
+"\">vebsajtu Epsona</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: src/app-window.vala:1380
+msgid "Install drivers"
+msgstr "Intaliraj upravljački program"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1411
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+"Kada instalirate upravljački program morate ponovo pokrenuti Jednostavno "
+"Skeniranje."
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Instalacija upravljačkog programa u toku…"
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1431
+msgid "Drivers installed successfully!"
+msgstr "Upravljački program uspešno instaliran!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1441
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Instalacija upravljačkog programa nije uspela (kod greške  %d)."
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1447
+msgid "Failed to install drivers."
+msgstr "Instalacija upravljačkog programa nije uspela."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Morate instalirati %s paket"
+msgstr[1] "Morate instalirati %s paketa"
+msgstr[2] "Morate instalirati %s paketa"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Postavke"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Prečice na tastaturi"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Pomoć"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programu"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Izlaz"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-pošta"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "_Ponovo pokreni…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotiraj stranicu nalevo (suprotno kazaljci na satu)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotiraj stranicu nadesno (smer kazaljke na satu)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Iseci označenu stranicu"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Obriši označenu stranicu"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Daj _pristup"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Korisničko ime:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Šifra:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Kodiranje stranice %i nije moguće"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skeniranje"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skeniranje jedne stranice"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skeniranje svih stranica iz fijoke"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skeniranje bez prekida sa položenog skenera"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Prekid tekućeg skeniranja"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Izmena dokumenta"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pomeranje stanice nalevo"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pomeranje stanice nadesno"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotiranje stranice nalevo (suprotno kazaljci na satu)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotiranje stranice nadesno (smer kazaljke na satu)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Brisanje stranice"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Upravljanje dokumentima"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Pravljenje novog dokumenta"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Čuvanje skeniranog dokumenta"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Slanje skeniranog dokumenta e-poštom"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Štampanje skeniranog dokumenta"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiranje trenutne stranice na ostavu"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skener"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Stranice za skeniranje"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Veličina stranice"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Prednja strana"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Zadnja strana"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obe strane"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Vremenski razmak"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Više strana sa položenog skenera"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "sekundi"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skeniranje"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Rezolucija _teksta"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Rezolucija _slike"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Osvetljenje"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalitet"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatski"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tamnije"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Svetlije"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Manje"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Više"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d tačaka po inču (podrazumevano)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d tačaka po inču (beleška)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d tačaka po inču (visoka rezolucija)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d tačaka po inču"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nijedan skener nije dostupan. Poveži skener."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nije moguće kontaktirati skener"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nije moguće početi skeniranje"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Greška u komunikaciji sa skenerom"
+
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Prikaži verziju"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Ispiši poruke za debagovanje"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Popravi PDF datoteke koje su napravile starije verzije Jednostavnog Skeniranja"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skeniranje nije uspelo"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Skeniranje u toku"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[UREĐAJ…] — Alat za skeniranje"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Pokrenite “%s --help” da biste videli listu svih opcija komandne linije."
diff --git a/po/stamp-po b/po/stamp-po
deleted file mode 100644
index 9788f70..0000000
--- a/po/stamp-po
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/po/sv.gmo b/po/sv.gmo
deleted file mode 100644
index cf84203..0000000
--- a/po/sv.gmo
+++ /dev/null
diff --git a/po/sv.po b/po/sv.po
index 67cd933..da8b55a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,519 +1,529 @@
 # Swedish translation for simple-scan
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright © 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.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2017.
+# Josef Andersson <l10nl18nsweja@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2015-08-25 06:00+0000\n"
-"Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-09-10 23:47+0200\n"
+"Last-Translator: Josef Andersson <l10nl18nsweja@gmail.com>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "A_uktorisera"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Enhet att skanna från"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Användarnamn för källa:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-enhet att hämta in bilder från."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Lösenord:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Typ av dokument att skanna"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ av dokument att skanna. Denna inställning bestämmer bildläsarens "
+"upplösning, färger och efterbehandling."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Fram- och baksida"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Bredd på pappret i tiondels millimeter"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Framsida"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+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)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Baksida"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Höjd på pappret i tiondels millimeter"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height 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 "
+"pappersidentifiering)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Ljusstyrka vid skanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+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:40
+msgid "Contrast of scan"
+msgstr "Kontrasten på skanningen"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Upplösning för textinläsningar"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+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 skannas in."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Upplösning för fotoinläsningar"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+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 skannas in."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Sida att skanna"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Papprets sida att skanna."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Katalog att spara filer i"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitetsvärde för JPEG-kompression"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitetsvärde för JPEG-kompression."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Fördröjning i millisekunder mellan sidor"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Fördröjning i millisekunder mellan sidor."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "Enkel bildinläsning"
+msgstr "Enkel bildläsning"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skanna dokument"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Läs _in"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Ett väldigt lätt sätt att skanna både dokument och foton. Du kan beskära "
+"bort dåliga delar av ett foto, och rotera det om det är felvänt. Du kan "
+"skriva ut det du skannat in, exportera till pdf, eller spara dem i ett brett "
+"utbud av bildformat."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Enkel bildläsning använder ramverket SANE för att hantera de flesta "
+"bildläsare som finns på marknaden."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentbildläsare"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbädd;adf;skan;skanner;bildläsare;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Enkel _sida"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Alla sidor från _matare"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stoppa inläsning"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Flera sidor från flatbädd"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Skann_a"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stoppa skanning"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Ändra sidordning"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Sida"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Rotera åt _vänster"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Rotera åt _höger"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Beskär"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
-msgstr "4x6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "An_passad"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
-msgstr "_Rotera beskär"
+msgstr "_Rotera beskärning"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Flytta åt vänster"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Flytta åt höger"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hjälp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Starta ett nytt dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nytt"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Läs in en enstaka sida från bildläsaren"
+msgstr "Skanna in en enstaka sida från bildläsaren"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
-msgstr "Läs in"
+msgstr "Skanna"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Spara"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
-msgstr "Stoppa den aktuella bildinläsningen"
+msgstr "Stoppa den aktuella skanningen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stoppa"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotera sidan åt vänster (motsols)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Rotera åt vänster"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rotera sidan åt höger (medsols)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Rotera åt höger"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Beskär den valda sidan"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Beskär"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Inställningar"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Inläsnings_källa:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Textupplösning:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotoupplösning:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Inläsningssida:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sidstorlek:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Ljusstyrka:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalitet:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentskanner"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Söker efter bildläsare…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Läs in dokument"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Stäng"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbädd;adf;skan;skanner;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Användarnamn och lösenord krävs för åtkomst till ”%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Redo att skanna"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"Ett väldigt lätt sätt att skanna både dokument och foton. Du kan beskära "
-"bort dåliga delar av ett foto, och rotera det om det är felvänt. Du kan "
-"skriva ut det du skannat in, exportera till pdf, eller spara dem i ett brett "
-"utbud av bildformat."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Ytterligare programvara behövs"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan använder ramverket SANE för att hantera de flesta skannrar som "
-"finns på marknaden."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Kan inte ansluta till bildläsare"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Kan inte starta inläsning"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Misslyckades med att läsa in"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ENHET...] - Bildinläsningsverktyg"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Kör \"%s --help\" för en komplett lista över tillgängliga "
-"kommandoradsflaggor."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Stäng"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Användarnamn och lösenord krävs för åtkomst till \"%s\""
+"Du behöver <a href=\"install-firmware\">installera drivrutiner</a> för din "
+"bildläsare."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Inga bildinläsare hittades"
+msgstr "Ingen bildläsare hittades"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollera att din bildläsare är ansluten och påslagen"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Ytterligare programvara behövs"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Du behöver installera drivrutiner för din skanner."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Spara som..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Spara som…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Spara"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr "Inläst dokument.pdf"
+msgstr "Skannat dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Bildfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alla filer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidigt dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimerad)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (förlustfri)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimerad)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Filformat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimering:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "En fil med namnet ”%s” finns redan.  Vill du ersätta den?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "E_rsätt"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Sparar"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktar bildläsare…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinera sidor"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinera sidor (omvänt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Omvänt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Behåll oförändrad"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -543,16 +553,16 @@ msgstr ""
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Om Enkel bildinläsning"
+msgstr "Om Enkel bildläsning"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
-msgstr "Enkelt verktyg för inläsning av dokument"
+msgstr "Enkelt verktyg för att skanna dokument"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -570,209 +580,519 @@ msgstr ""
 "deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
-msgstr "Spara dokumment innan du avslutar?"
+msgstr "Spara dokument innan du avslutar?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Du verkar ha en skanner från Brother."
+msgstr "Du verkar ha en bildläsare från Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Drivrutinerna finns på <a href=\"http://support.brother.com\">Brothers "
 "webbplats</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Du verkar ha en skanner från Samsung."
+msgstr "Du verkar ha en bildläsare från Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Drivrutinerna finns på <a href=\"http://samsung.com/support\">Samsungs "
 "webbplats</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Du verkar ha en skanner från HP."
+msgstr "Du verkar ha en bildläsare från HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Du verkar ha en skanner från Epson."
+msgstr "Du verkar ha en bildläsare från Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Drivrutiner är tillgängliga på <a href=\"http://support.epson.com\">Epsons "
 "webbplats</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Installera drivrutiner"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Efter installation kan du behöva starta om Simple Scan."
+msgstr "Efter installation kan du behöva starta om Enkel bildläsning."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Installerar drivrutiner..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Installerar drivrutiner…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Drivrutinerna installerades!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Kunde inte installera drivrutiner (felkod %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Kunde inte installera drivrutiner."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Du behöver installera paketet %s."
+msgstr[1] "Du behöver installera paketen %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tangentbordsgenvägar"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Hjälp"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Om"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Avsluta"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-post"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Starta igen…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotera sidan åt vänster (motsols)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotera sidan åt höger (medsols)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Beskär den valda sidan"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Radera den valda sidan"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "A_uktorisera"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Användarnamn för källa:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Lösenord:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Du behöver installera paket(en) %s."
+msgid "Unable to encode page %i"
+msgstr "Kunde inte koda sida %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skannar"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skanna in en enstaka sida"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skanna in alla sidor från dokumentmataren"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skanna kontinuerligt från en flatbäddsbildläsare"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stoppa pågående skanning"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentändring"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Flytta sidan åt vänster"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Flytta sidan åt höger"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotera sidan åt vänster (motsols)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotera sidan åt höger (medsols)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Ta bort sida"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumenthantering"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Starta nytt dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Spara inläst dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-posta inläst dokument"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Skriv ut inläst dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiera aktuell sida till urklipp"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Bildläsare"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Inläsningssida"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Sidstorlek"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Framsida"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Baksida"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Båda"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Fördröjning"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Flera sidor från flatbädd"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunder"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skanna"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Textupplösning"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Fotoupplösning"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Ljusstyrka"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalitet"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Mörkare"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Ljusare"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Lägre"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Högre"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hög upplösning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nytt dokument"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Inga bildläsare finns tillgängliga. Anslut en bildläsare."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Kan inte ansluta till bildläsare"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-post..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Kan inte starta bildläsare"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Skriv ut..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Fel i kommunikation med bildläsare"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Hjälp"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Visa utgåvans version"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Om"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Skriv ut felsökningsmeddelanden"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Avsluta"
+#: 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 Enkel bildläsning"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Byt _bildinläsare"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Misslyckades med att skanna"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installera drivrutiner"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Inläsning pågår"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatiskt"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ENHET…] — Bildläsarverktyg"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Mörkare"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Kör ”%s --help” för en komplett lista över tillgängliga kommandoradsflaggor."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Ljusare"
+#~ msgid "_Install Drivers"
+#~ msgstr "_Installera drivrutiner"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Mindre"
+#~ msgid "Saving document…"
+#~ msgstr "Sparar dokument…"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Mer"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Sparar sida %d av %d"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#~ msgid "Front and Back"
+#~ msgstr "Fram- och baksida"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#~ msgid "New"
+#~ msgstr "Nytt"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Sparar dokument..."
+#~ msgid "Rotate Left"
+#~ msgstr "Rotera åt vänster"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Sparar sida %d av %d"
+#~ msgid "Rotate Right"
+#~ msgstr "Rotera åt höger"
+
+#~ msgid "Crop"
+#~ msgstr "Beskär"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "Inläsnings_källa:"
+
+#~ msgid "New Document"
+#~ msgstr "Nytt dokument"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Email…"
+#~ msgstr "E-post…"
+
+#~ msgid "Print…"
+#~ msgstr "Skriv ut…"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimum"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximum"
+
+#~ msgid "Email..."
+#~ msgstr "E-post..."
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Enhet att läsa in från"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Riktning för inläsning"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -789,15 +1109,6 @@ msgstr "Sparar sida %d av %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Höjd för den inlästa bilden i bildpunkter"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-enhet att hämta in bilder från."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Upplösning för textinläsningar"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Upplösning för fotoinläsningar"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Upplösning för senaste inlästa bild"
 
@@ -816,7 +1127,6 @@ msgstr "Sparar sida %d av %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE om programfönstret är maximerat"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -832,7 +1142,6 @@ msgstr "Sparar sida %d av %d"
 #~ "  --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 "
@@ -854,51 +1163,31 @@ msgstr "Sparar sida %d av %d"
 #~ "  --gtk-module=MODULER            Läs in ytterligare GTK+-moduler\n"
 #~ "  --g-fatal-warnings              Gör alla varningar ödesdigra"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Typ av dokument som ska läsas in"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Inläst dokument"
-
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Höjd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
-#~ "som senaste inlästa bilden använde."
+#~ "Höjd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till "
+#~ "vad som senaste inlästa bilden använde."
 
 #~ 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'"
+#~ "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\""
+#~ "följande: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-"
+#~ "to-left\""
 
 #~ 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."
 
-#~ 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."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Katalog att spara filer i"
-
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
+#~ "Bredd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till "
+#~ "vad som senaste inlästa bilden använde."
 
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
@@ -910,60 +1199,11 @@ msgstr "Sparar sida %d av %d"
 #~ "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\""
-
-#~ msgid "Page side to scan"
-#~ msgstr "Sida att läsa in"
-
-#~ msgid ""
-#~ "The height 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 "
-#~ "pappersidentifiering)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Höjd på pappret i tiondels millimeter"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Bredd på pappret i tiondels millimeter (eller 0 för automatisk "
-#~ "pappersidentifiering)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Bredd på pappret i tiondels millimeter"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Papprets sida att läsa in."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Typ av dokument att läsa in. Denna inställning bestämmer inläsningens "
-#~ "upplösning, färger och efterbehandling."
+#~ "Sidan att läsa in. Det kan vara en av följande: \"both\" \"front\" \"back"
+#~ "\""
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Riktningen för bildläsaren över den inlästa sidan."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Inställningen av kontrast från -100 till 100 (0 betyder ingen)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrasten på skanningen"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Instöllningen av ljusstyrkan från -100 till 100 (0 betyder ingen)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Ljusstyrka i skanningen"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kvalitets värde i JPEG kompression"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kvalitets värde i JPEG kompression"
diff --git a/po/ta.gmo b/po/ta.gmo
deleted file mode 100644
index 42ef5c6..0000000
--- a/po/ta.gmo
+++ /dev/null
diff --git a/po/ta.po b/po/ta.po
index 43553a6..72741ae 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2014-03-22 13:36+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tamil <ta@li.org>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_அனுமதியளி"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "முன் மற்றும் பின்"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "முன்னால்"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "பின் செல்க"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "தனி _பக்கம்"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "அனைத்து பக்கங்களை பீடர் இருந்து உள்ளன"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "உரை"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_மின்னஞ்சல்"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "இடதுபுறமாக சுழற்று"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_ வெட்டு"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "(_C) தனிப்பயன்"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "வலப்பக்கம் நகர்"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_உதவி"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_உள்ளடக்கங்கள்"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "வலப்பக்கம் சுழற்று"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "தேர்வு செய்த பக்கத்தை வெட்டு"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "பக்க அளவு:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -541,189 +566,189 @@ msgstr ""
 "  mano-மனோ https://launchpad.net/~manoj-neyveli"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/te.gmo b/po/te.gmo
deleted file mode 100644
index 1d53b35..0000000
--- a/po/te.gmo
+++ /dev/null
diff --git a/po/te.po b/po/te.po
index 15a57d1..c78c501 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "అధికారమిచ్చు(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "వనరుకు వాడుకరిపేరు(_U):"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "సంకేతపదం(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "ముందు మరియు వెనుక"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "ముందుభాగం"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "వెనుకకు"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "సింపుల్ స్కాన్"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "పత్రం (_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "స్కాన్(_a)"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "ఒక పేజీ(_P)"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "ఫీడర్ నుండి అన్ని పేజీలు(_F)"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "స్కాన్ ఆపు(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "పాఠ్యం"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "ఫొటో"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "ఈమెయిల్(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "పేజీ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "ఎడమవైపు తిప్పు (_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "కుడివైపు తిప్పు(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "క్రాప్ చేయి(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "ఏదీకాదు(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "లెటర్ (_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "లీగల్ (_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "మలచుకొను(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "క్రాప్‌చేసినదానిని తిప్పు(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "ఎడమకు జరుపు"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "కుడి వైపు జరుపు"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "సహాయం (_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "విషయసూచిక(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "ఒక కొత్త పత్రాన్ని ప్రాంరంభించు"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "కొత్త"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "స్కానర్ నుండి ఒకే ఒక పేజీ స్కాన్ చేయి"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "స్కాన్"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "భద్రపరచు"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "ప్రస్తుత స్కాన్ ఆపు"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "ఆపు"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ఎడమవైపుకు త్రిప్పు (అపసవ్య)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "ఎడమవైపు తిప్పు"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "కుడి వైపుకు త్రిప్పు (సవ్య)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "కుడివైపు తిప్పు"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "ఎంపికైన పెజీ అంచులుసవరించు"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "అంచులుసవరించు"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "స్కాన్ మూలం (_o):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "పాఠ విభాజకత (_T)"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "ఫొటో విభాజకత(_P)"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "స్కాన్ చేయు ప్రక్క:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "పేజీ పరిమాణం:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "పత్రాలు స్కాన్ చేయు"
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,197 +330,208 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ఏ స్కానర్‌లు అందుబాటులోలేవు. దయచేసి ఒక స్కానర్‌ను అనుసంధానించండి."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "స్కానర్‌కు అనుసంధానించలేకపోతోంది"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "స్కాన్ ప్రారంభించుట వీలుకాలేదు"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "స్కానర్‌తో వర్తమాన దోషం"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "విడుదల రూపాంతరాన్ని చూపించు"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "దోషశుద్ధి సందేశాలను ముద్రించు"
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "స్కాన్‌చేయుటలో విఫలమైంది"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "అందుబాటులో వున్న అదేశ వరుస ఐచ్చికముల కొరకు '%s --help' నడుపు."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' వాడుటకు వాడుకరిపేరు మరియు సంకేతపదం కావాలి"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "ఏ స్కానర్‌లు కనిపెట్టబడలేదు"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "మీ స్కానర్ విద్యుత్తుచే చేతనమై కంప్యూటర్‌కు అనుసంధానమైనదో లేదో చూడండి."
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "ఇలా దాచు..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "బొమ్మ ఫైళ్లు"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (బహుళ-పేజి పత్రం)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (కుదించిన)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (నష్టంలేని)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "ఫైల్ దాచుటలో విఫలమైంది"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "ప్రస్తుత పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "మార్పులు వదలివేయి"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "మునుజూపు కొరకు బొమ్మను భద్రపరుచులేకపోతున్నది"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "బొమ్మ మునుజూపు అనువర్తనం తెరచుట వీలుకాలేదు"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "సహాయ ఫైలు తెరువలేకపోయింది"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -534,16 +559,16 @@ msgstr ""
 " లేనిచో చూడండి <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "సింపుల్ స్కాన్ గురించి"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "సులభంగా పత్ర స్కానింగ్‌చేయు సాధనం"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -553,189 +578,189 @@ msgstr ""
 "  వీవెన్ https://launchpad.net/~veeven"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "నిష్క్రమించేముందు పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "దాచకుండా నిష్క్రమించు"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (అప్రమేయ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (చిత్తు)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "స్కానర్‌ను మార్చు(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "స్వయంచాలక"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/th.gmo b/po/th.gmo
deleted file mode 100644
index cf3d044..0000000
--- a/po/th.gmo
+++ /dev/null
diff --git a/po/th.po b/po/th.po
index 864fd5e..5b3c946 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,308 +7,322 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 09:09+0000\n"
-"Last-Translator: AnuchitChalothorn <anoochit@gmail.com>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
+"PO-Revision-Date: 2017-03-29 06:29+0000\n"
+"Last-Translator: Rockworld <sumoisrock@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_อนุญาต"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_ชื่อผู้ใช้ทรัพยากร :"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "รหัส_ผ่าน:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "หน้าและหลัง"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "หน้า"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "หลัง"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "เ_อกสาร"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "สแกน"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "_หน้าเดี่ยว"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "ทุกหน้าจาก_ตัวป้อนกระดาษ"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "_หยุดสแกน:"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "ข้อความ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "ภาพถ่าย"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
-msgstr ""
+msgstr "สั่งพิมพ์หน้าต่าง ๆ ใหม่"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_อีเมล"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_หน้า"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "หมุน_ซ้าย"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "หมุน_ขวา"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_ตัด"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "ไ_ม่มี"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_จดหมาย"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_กำหนดเอง"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "หมุ_นภาพตัด"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "ย้ายไปทางซ้าย"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "ย้ายไปทางขวา"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_วิธีใช้"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "เ_นื้อหา"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "เริ่มเอกสารใหม่"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "สร้าง"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "สแกนหน้าเดียวจากเครื่องสแกน"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "สแกน"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "บันทึกเอกสารเป็นแฟ้ม"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "บันทึก"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "หยุดการสแกนขณะนี้"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "หยุด"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "หมุนหน้าไปทางซ้าย (ทวนเข็มนาฬิกา)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "หมุนซ้าย"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "หมุนหน้าไปทางขวา (ตามเข็มนาฬิกา)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "หมุนขวา"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "ตัดหน้าที่เลือก"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "ตัด"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "คุณสมบัติ"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "แ_หล่งสแกน:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "ความละเอียด_ข้อความ:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "ความละเอียด_ภาพถ่าย:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "สแกนด้าน:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "ขนาดกระดาษ :"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
-msgstr ""
+msgstr "ความสว่าง:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
-msgstr ""
+msgstr "ความเปรียบต่าง:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
+msgstr "คุณภาพ:"
+
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
 msgstr ""
 
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
-msgstr ""
+msgstr "เครื่องสแกนเอกสาร"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "สแกนเอกสาร"
 
 #: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+msgstr "สแกน;สแกนเนอร์;flatbed;adf;"
 
 #: data/simple-scan.desktop.in:8
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "เครื่องสแกนไม่สามารถใช้ได้ โปรดเชื่อมต่อเครื่องสแกน"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "ไม่สามารถเชื่อมต่อเครื่องสแกน"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "ไม่สามารถเริ่มต้นการสแกน"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "การสื่อสารกับเครื่องสแกนผิดพลาด"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "แสดงรุ่นที่ออก"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "แสดงข้อความข้อบกพร่อง"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "การสแกนล้มเหลว"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - เครื่องมือกำลังสแกน"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "เรียก '%s --help' เพื่อดูตัวเลือกทั้งหมดที่มีของบรรทัดคำสั่ง"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
-msgstr ""
+msgstr "_ปิด"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ต้องการชื่อผู้ใช้และรหัสผ่านเพื่อเข้าใช้ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "ไม่พบเครื่องสแกน"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
-msgstr ""
+msgstr "ต้องติดตั้งซอฟต์แวร์เพิ่มเติม"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "คุณต้องติดตั้งซอฟต์แวร์ไดรเวอร์สำหรับสแกนเนอร์ของคุณ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
-msgstr ""
+msgstr "_ยกเลิก"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
-msgstr ""
+msgstr "_บันทึก"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "สแกน Document.pdf แล้ว"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "แฟ้มภาพ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (เอกสารหลายหน้า)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (บีบอัดแล้ว)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
+msgstr "รูปแบบแฟ้ม:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "การบันทึกแฟ้มล้มเหลว"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "บันทึกเอกสารปัจจุบัน"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "ไม่สามารถบัญทึกรูปภาพตัวอย่าง"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
-msgstr ""
+msgstr "รวมด้านข้าง"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "รวมด้านข้าง (ย้อนกลับ)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
-msgstr ""
+msgstr "ย้อนกลับ"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "ปล่อยให้ไม่มีการเปลี่ยนแปลงต่อไป"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -534,16 +559,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "เกี่ยวกับ Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -556,192 +581,198 @@ msgstr ""
 "  kijjaz https://launchpad.net/~kijjaz-gmail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "บันทึกเอกสารก่อนปิดหรือไม่?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "ดูเหมือนว่าคุณจะมีสแกนเนอร์ของ Brother"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
+"ไดรเวอร์ของ Brother สามารถพบได้ใน<a "
+"href=\"http://support.brother.com\">เว็บไซต์ของ Brother</a>"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "ดูเหมือนว่าคุณจะมีสแกนเนอร์ของ Samsung"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
+"ไดรเวอร์ของ Samsung สามารถพบได้ใน<a "
+"href=\"http://samsung.com/support\">เว็บไซต์ Samsung</a>"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "ดูเหมือนว่าคุณจะมีสแกนเนอร์ของ HP"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "ดูเหมือนว่าคุณจะมีสแกนเนอร์ของ Epson"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"ไดรเวอร์ของ Epson สามารถพบได้ใน<a href=\"http://support.epson.com\">เว็บไซต์ "
+"Epson</a>"
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
-msgstr ""
+msgstr "ติดตั้งไดรเวอร์"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "หลังจากที่คุณติดตั้งแล้ว คุณต้องเริ่มโปรแกรม Simple Scan ใหม่"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
-msgstr ""
+msgstr "กำลังติดตั้งไดรเวอร์..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "ติดตั้งไดรเวอร์สำเร็จแลัว!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "การติดตั้งไดรเวอร์ล้มเหลว (โค้ดผิดพลาด %d)"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "ไม่สามารถติดตั้งไดรเวอร์"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "คุณจำเป็นต้องติดตั้งแพกเกจ %s"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ค่าปริยาย)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ภาพร่าง)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
-msgstr ""
+msgstr "เอกสารใหม่"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
-msgstr ""
+msgstr "เอกสาร"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
-msgstr ""
+msgstr "อีเมล..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
-msgstr ""
+msgstr "พิมพ์..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
-msgstr ""
+msgstr "วิธีใช้"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
-msgstr ""
+msgstr "เกี่ยวกับ"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
-msgstr ""
+msgstr "เลิก"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
-msgstr ""
+msgstr "_ติดตั้งไดรเวอร์"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
-msgstr ""
+msgstr "มืดลงกว่าเดิม"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
-msgstr ""
+msgstr "สว่างขึ้นกว่าเดิม"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
-msgstr ""
+msgstr "น้อยลง"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
-msgstr ""
+msgstr "มากขึ้น"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
-msgstr ""
+msgstr "ขั้นต่ำ"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
-msgstr ""
+msgstr "สูงสุด"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
-msgstr ""
+msgstr "กำลังบันทึกเอกสาร..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr ""
+msgstr "กำลังบันทึกหน้า %d จากทั้งหมด %d หน้า"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
diff --git a/po/tr.gmo b/po/tr.gmo
deleted file mode 100644
index 35f5a6e..0000000
--- a/po/tr.gmo
+++ /dev/null
diff --git a/po/tr.po b/po/tr.po
index f59fe71..c5e50d1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,515 +1,531 @@
 # Turkish 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.
+# Emin Tufan Çetin <etcetin@gmail.com>, 2017.
+# Muhammet Kara <muhammetk@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-13 15:04+0300\n"
+"Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
+"Language-Team: Turkish <gnometurk@gnome.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Yetkilendir"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Tarama yapılacak aygıt"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Kaynak için _kullanıcı adı:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Görüntülerin alınacağı SANE aygıtı"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Parola:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Taranacak belgenin türü"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Taranacak belgenin türü. Bu ayar tarama niteliği, renkler ve rötuşa göre "
+"belirlenir."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Ön ve Arka taraf"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Ondabirlik mm türünden kağıdın genişliği"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Ön taraf"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Ondabirlik mm türünden kağıdın genişliği (ya da kendiliğinden kağıt sezimi "
+"için 0)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Arka taraf"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Ondabirlik mm türünden kağıdın yüksekliği"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Ondabirlik mm türünden kağıdın yüksekliği (ya da kendiliğinden kağıt sezimi "
+"için 0)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Tarama parlaklığı"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "-100ʼden 100ʼe (0 hiçbiri) parlaklık ayarlaması."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Tarama karşıtlığı"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+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:45
+msgid "Resolution for text scans"
+msgstr "Metin taramaları için çözünürlük"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"Metin tararken kullanılacak inç başına nokta sayısı türünden çözünürlük."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Fotoğraf taramaları için çözünürlük"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Fotoğrafları tararken kullanılacak inç başına nokta sayısı türünden "
+"çözünürlük."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Taranacak sayfa yüzü"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Taranacak sayfa yüzü."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Dosyaların kaydedileceği dizin"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+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/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG sıkıştırması için kalite değeri"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG sıkıştırması için kalite değeri"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Sayfalar arasındaki gecikmenin milisaniye türünden değeri"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Sayfalar arasındaki gecikmenin milisaniye türünden değeri."
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Basit Tarama"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Belge"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Belgeleri Tara"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "T_ara"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"Hem belge hem fotoğraf taramanın çok kolay bir yolu. Bir fotoğrafın kötü "
+"tarafını kırpabilir ve eğer yanlış yönde ise onu döndürebilirsiniz. "
+"Taramalarınızı yazdırabilir, pdfʼye aktarabilir veya resim biçimlerinde "
+"kaydedebilirsiniz."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Basit Tarama mevcut birçok tarayıcı desteği için SANE altyapısını kullanır."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Belge Tarayıcı"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "tara;tarayıcı;flatbed;düz yatak;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
-msgstr "_Tek Sayfa"
+msgstr "Tek _Sayfa"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Kaynaktaki Tüm _Sayfalar"
+msgstr "_Kaynaktaki Tüm Sayfalar"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Taramayı Durdur"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Düz Yataktan _Çoklu Sayfa"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Metin"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotoğraf"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Belge"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "T_ara"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Taramayı Durdur"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Sayfaları Yeniden Sırala"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-posta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Sayfa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "_Sola Döndür"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
-msgstr "Sa_ğa Çevir"
+msgstr "Sa_ğa Döndür"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Kırp"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Hiçbiri"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Harf"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Ya_sal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Özel"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Kırpmayı Döndür"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Sola Taşı"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Yardım"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_İçindekiler"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Yeni bir belge başlat"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Yeni"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Tara"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Kaydet"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Geçerli taramayı durdur"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Durdur"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Sayfayı sola döndür (saat yönünün tersine)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Sola Döndür"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Tarayıcılar aranıyor…"
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Sayfayı sağa döndür (saat yönünde)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Sağa Döndür"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Seçili sayfayı kırp"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Kırp"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Tercihler"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Ta_rama Kaynağı:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Metin Çözünürlüğü:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotoğraf Çözünürlüğü:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Taranacak taraf:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sayfa Boyutu:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Parlaklık:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Karşıtlık:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kalite:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Belge Tarayıcı"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Belgeleri Tara"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Kapat"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "tara;tarayıcı;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "“%s” kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Taramaya hazır"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Ek yazılım gerekiyor"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Basit Tarayıcı mevcut bir çok tarayıcı desteği için SANE altyapısını "
-"kullanır."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Tarayıcıya bağlanılamadı"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "Tarama başlatılamadı"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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.vala:391
-msgid "Failed to scan"
-msgstr "Tarama başarısız oldu"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[AYGIT...] - Tarama uygulaması"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Kullanılabilir komut satırı seçeneklerinin tam listesini görmek için '%s --"
-"help' komutunu çalıştırın."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Kapat"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "'%s' kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
+"Tarayıcınız için <a href=\"install-firmware\">sürücü yazılımını kurmanız</a> "
+"gerekir."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "Ek yazılıma ihtiyaç var"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Tarayıcınız için ek sürücü yazılımını kurmanız gerekir."
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Farklı Kaydet..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Farklı Kaydet…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Vazgeç"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Kaydet"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (çok sayfalı belge)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (sıkıştırılmış)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (kayıpsız)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (sıkıştırılmış)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Dosya biçimi:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Sıkıştırma:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "“%s” adında bir dosya zaten var.  Değiştirmek ister misiniz?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Değiştir"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Kaydediliyor"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Dosya kaydedilemedi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Eğer kaydetmezseniz, değişiklikler tamamen kaybedilecek."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Eğer kaydetmezseniz, değişiklikler kalıcı olarak kaybedilecek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
-msgstr "Mevcut belgeyi kaydet?"
+msgstr "Geçerli belgeyi kaydet?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Tarayıcıyla iletişim kuruluyor…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Görüntü, önizleme için kaydedilemiyor"
+msgstr "Görüntü, ön izleme için kaydedilemiyor"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Görüntü ön izleme uygulaması açılamıyor"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Yüzleri birleştir"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Yüzleri birleştir (ters)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Tersine çevir"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Değiştirmeden bırak"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -531,23 +547,23 @@ msgstr ""
 "Bu program HERHANGİ GARANTİSİ OLMAKSIZIN; hatta TİCARETE UYGUNLUK veya BELLİ "
 "BİR AMACA UYGUNLUK garantisi bile olmaksızın, kullanışlı olması umularak "
 "dağıtıldı.\n"
-"Daha fazla bilgi için GNU Genel Kamu Lisansı'na bakın.\n"
+"Daha fazla bilgi için GNU Genel Kamu Lisansıʼna bakın.\n"
 "\n"
-"Bu program ile birlikte GNU Genel Kamu Lisansı'nın bir kopyasını almış "
+"Bu program ile birlikte GNU Genel Kamu Lisansıʼnın bir kopyasını almış "
 "olmalısınız.\n"
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -570,206 +586,520 @@ msgstr ""
 "  kulkke https://launchpad.net/~kulkke\n"
 "  mandza https://launchpad.net/~filmovi\n"
 "  ubuntuki https://launchpad.net/~aleverzurumlu\n"
-"  İbrahim Çelik https://launchpad.net/~ibrahimcelik89"
+"  İbrahim Çelik https://launchpad.net/~ibrahimcelik89\n"
+"\n"
+"GNOME Türkiye Çeviri Takımı:\n"
+"  Emin Tufan Çetin <etcetin@gmail.com>"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Bir Brother tarayıcıya sahip olduğunuz görünüyor."
+msgstr "Bir Brother tarayıcınız olduğu görünüyor."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Bunun sürücüleri <a href=\"http://support.brother.com\">Brother "
-"websitesinde</a> mevcuttur."
+"Bunun sürücüleri <a href=\"http://support.brother.com\">Brother web "
+"sitesinde</a> bulunabilir."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Bir Samsung tarayıcıya sahip olduğunuz görünüyor."
+msgstr "Bir Samsung tarayıcınız olduğu görünüyor."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Bunun sürücüleri <a href=\"http://samsung.com/support\">Samsung "
-"websitesinde</a> mevcuttur."
+"Bunun sürücüleri <a href=\"http://samsung.com/support\">Samsung web "
+"sitesinde</a> bulunabilir."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Bir HP tarayıcıya sahip olduğunuz görünüyor."
+msgstr "Bir HP tarayıcınız olduğu görünüyor."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Bir Epson tarayıcıya sahip olduğunuz görünüyor."
+msgstr "Bir Epson tarayıcınız olduğu görünüyor."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Bunun sürücüleri <a href=\"http://samsung.com/support\">Epson "
-"websitesinde</a> mevcuttur."
+"Bunun sürücüleri <a href=\"http://samsung.com/support\">Epson web sitesinde</"
+"a> bulunabilir."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Sürücüleri kur"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Yükledikten sonra Basit Tarama'yı yeniden başlatmanız gerekiyor."
+msgstr "Yükledikten sonra Basit Taramaʼyı yeniden başlatmanız gerekiyor."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Sürücüler kuruluyor..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Sürücüler kuruluyor…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Sürücüler başarıyla kuruldu!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Sürücülerin kurulumu başarısız oldu (error code %d)."
+msgstr "Sürücülerin kurulumu başarısız oldu (hata kodu %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Sürücülerin kurulumu başarısız oldu."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "%s paket kurulmasına ihtiyacınız var."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "%s paket kurmanız gerekiyor."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Klavye Kısayolları"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Yardım"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Hakkında"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Çık"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-posta"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Yeniden Başlat…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Sayfayı sola döndür (saat yönünün tersine)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Sayfayı sağa döndür (saat yönünde)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Seçili sayfayı kırp"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Seçili sayfayı sil"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Vazgeç"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Yetkilendir"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Kaynak için _kullanıcı adı:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Parola:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "%i. sayfa kodlanamıyor"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Tarama"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Tek bir sayfa tara"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Belge besleyicisinden tüm sayfaları tara"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Düz yatak tarayıcıdan sürekli tara"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Süren taramayı durdur"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Belge Değiştirme"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Sayfayı sola taşı"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Sayfayı sağa taşı"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Sayfayı sola döndür (saat yönünün tersine)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Sayfayı sağa döndür (saat yönünde)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Sayfayı sil"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Belge Yönetimi"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Yeni belge başlat"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Taranmış belgeyi kaydet"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Taranmış belgeyi e-postala"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Taranmış belgeyi yazdır"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Geçerli sayfayı panoya kopyala"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Tarayıcı"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Tarama Yüzleri"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Sayfa Boyutu"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Ön"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Arka"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Her İkisi"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Gecikme"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "Multiple page from flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Düz yataktan çoklu sayfa"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Saniye"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Tarama"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Metin Çözünürlüğü"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Fotoğraf Çözünürlüğü"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Parlaklık"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Karşıtlık"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Nitelik"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Kendiliğinden"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Daha koyu"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Daha açık"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Daha az"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Daha çok"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
-msgstr "%d dpi (varsayılan)"
+msgstr "%d dpi (öntanımlı)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (yüksek çözünürlük)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Yeni Belge"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Kullanılabilir tarayıcı yok. Lütfen bir tarayıcı bağlayın."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Belge"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Tarayıcıya bağlanılamadı"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-Posta..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Tarama başlatılamadı"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Yazdır..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Tarayıcı ile iletişim kurulamıyor"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Yardım"
+#. 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"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Hakkında"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Hata ayıklama iletilerini yazdır"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Çık"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "_Tarayıcı Değiştir"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Tarama başarısız oldu"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "Sürücüleri _Kur"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Tarama sürüyor"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Otomatik"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[AYGIT…] — Tarama uygulaması"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Daha Koyu"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Kullanılabilir komut satırı seçeneklerinin tam listesini görmek için “%s --"
+"help” komutunu çalıştırın."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Daha Açık"
+#~ msgid "Saving document…"
+#~ msgstr "Belge kaydediliyor…"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Daha Az"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Kaydedilen sayfa: %d / %d"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Daha Fazla"
+#~ msgid "Front and Back"
+#~ msgstr "Ön ve Arka taraf"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "En Az"
+#~ msgid "New"
+#~ msgstr "Yeni"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "En Çok"
+#~ msgid "Rotate Left"
+#~ msgstr "Sola Döndür"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Belge kaydediliyor..."
+#~ msgid "Rotate Right"
+#~ msgstr "Sağa Döndür"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Kaydedilen sayfa: %d / %d"
+#~ msgid "Crop"
+#~ msgstr "Kırp"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "Ta_rama Kaynağı:"
+
+#~ msgid "New Document"
+#~ msgstr "Yeni Belge"
+
+#~ msgid "Document"
+#~ msgstr "Belge"
+
+#~ msgid "Email..."
+#~ msgstr "E-Posta..."
+
+#~ msgid "Print..."
+#~ msgstr "Yazdır..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "Sürücüleri _Kur"
+
+#~ msgid "Minimum"
+#~ msgstr "En Az"
+
+#~ msgid "Maximum"
+#~ msgstr "En Çok"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -777,7 +1107,6 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "Usage:\n"
 #~ "  %s [AYGIT...] - Tarama aracı"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -790,10 +1119,10 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "  --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"
+#~ "  --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"
@@ -814,7 +1143,6 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Pencerenin piksel cinsinden genişliği"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -830,30 +1158,19 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "  -help-all Tüm yardım seçeneklerini göster\n"
 #~ "  --help-gtk GTK+ seçeneklerini göster"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Tarama yapılacak aygıt"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Tarama yönü"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Metin taramaları için çözünürlük"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Fotoğraf taramaları için çözünürlük"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Dosyaların kaydedileceği dizin"
-
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Taranan görüntünün piksel cinsinden yüksekliği"
 
 #~ 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'"
+#~ "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'"
+#~ "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 ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
@@ -862,41 +1179,21 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "Taranan görüntünün piksel cinsinden yüksekliği. Bu değer en son taranan "
 #~ "sayfaya göre güncellenir."
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Görüntülerin alınacağı SANE aygıtı"
-
-#~ 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."
-
 #~ 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üğü."
+#~ "Bir önceki taranan görüntünün inç başına nokta sayısı cinsinden "
+#~ "çözünürlüğü."
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "En son taranan görüntünün çözünürlüğü"
 
-#~ 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."
-
 #~ 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."
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "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."
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Taranacak belgenin türü"
-
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -906,71 +1203,18 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "'fotoğraf'. Bu ayar tarama çözünürlüğünü, renkleri ve  tarama sonrası "
 #~ "işlemleri belirler."
 
-#~ msgid "Scanned Document"
-#~ msgstr "Taranmış Belge"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Dosya _Türünü Seç"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Taranacak sayfa tarafı"
-
-#~ 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'"
-
 #~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Ondabirlik mm cinsinden kağıdın yüksekliği ( ya da otomatik kağıt tespiti "
-#~ "için 0)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Ondabirlik mm cinsinden kağıdın yüksekliği"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Ondabirlik mm cinsinden kağıdın genişliği ( ya da otomatik kağıt tespiti "
-#~ "için 0)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Ondabirlik mm cinsinden kağıdın genişliği"
+#~ "Taranacak sayfa tarafı. Şu seçeneklerden biri olabilir: 'her iki taraf' "
+#~ "'ön taraf' 'arka taraf'"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Uygulama penceresi ekranı kapladığında DOĞRU (TRUE)"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Taranacak belge türü. Bu ayar tarama kalitesi, renkler ve son işlemlere göre "
-#~ "belirlenir."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Tarayıcının taranmış sayfa boyunca yönü."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Taranacak sayfa yüzü."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Tarama parlaklığı"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "JPEG sıkıştırması için kalite değeri"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "JPEG sıkıştırması için kalite değeri"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "-100'den 100'e (0 hiçbiri) karşıtlık ayarlaması"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "-100'den 100'e (0 hiçbiri) parlaklık ayarlaması"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Tarama karşıtlığı"
diff --git a/po/ug.gmo b/po/ug.gmo
deleted file mode 100644
index fdc9175..0000000
--- a/po/ug.gmo
+++ /dev/null
diff --git a/po/ug.po b/po/ug.po
index dc88f13..90d5fd4 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,299 +7,313 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ug\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "كىملىك دەلىللە(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "مەنبەنىڭ ئىشلەتكۈچى ئاتى(_U):"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "ئىم(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "ئالدى-كەينى"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "ئالدى"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "كەينى"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "ئاددىي شويلىلاش"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "پۈتۈك(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "شويلىلا(_A)"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "بىرلا بەت(_P)"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "كىرگۈزۈلگەن ھەممە بەتلەر(_F)"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "شويلىلاشنى توختات(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "تېكىست"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "سۈرەت"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "بەتلەرنى قايتا تىزىش"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "ئېلخەت(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "بەت(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "سولغا چۆرگىلەت(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "ئوڭغا چۆرگىلەت(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "قىرقى(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "يوق(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US Legal(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "ئىختىيارى(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "قىرقىغاننى چۆرگىلەت(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "ئوڭغا يۆتكە"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "مەزمۇنلار(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "يېڭى ھۆججەت قۇرىدۇ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "يېڭى"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "شويلىلىغۇچتىن پەقەت بىر بەتنىلا شويلىلايدۇ"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "شويلىلاش"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "پۈتۈكنى ھۆججەتكە ساقلايدۇ"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "ساقلا"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "نۆۋەتتىكى شويلىلاش باسقۇچىنى توختىتىدۇ"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "توختا"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "بەتنى سولغا چۆرگىلىتىدۇ(سائەت يۆلىنىشىگە قارشى)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "سولغا چۆرگىلەت"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "بەتنى ئوڭغا چۆرگىلىتىدۇ (سائەت يۆلىنىشىدە)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "ئوڭغا چۆرگىلەت"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "تاللانغان بەتنى قىرقىيدۇ"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "قىرقى"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "مايىللىق"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "شويلىلاش مەنبەسى(_O):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "تېكىست ئېنىقلىقى(_T):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "سۈرەت ئېنىقلىقى(_P):"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "شويلىلايدىغان يۈزى:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "قەغەز چوڭلۇقى:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "يورۇقلۇقى:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "سېلىشتۇرما دەرىجىسى:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "سۈپىتى:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "پۈتۈك شويلىلاش"
 
@@ -311,7 +325,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -319,198 +333,209 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "شويلىلىغۇچ مەۋجۇت ئەمەس. شويلىلىغۇچنى چېتىڭ."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "شويلىلىغۇچقا باغلانغىلى بولمىدى"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "شويلىلاشنى باشلىغىلى بولمىدى"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "شويلىلىغۇچ بىلەن ئالاقە باغلاشتا خاتالىق كۆرۈلدى"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "نەشرىنى كۆرسەت"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "سازلاش ئۇچۇرلىرىنى كۆرسەت"
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "شويلىلاش مەغلۇپ بولدى"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ئۈسكۈنە...] - شويلىلاش قورالى."
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "'%s --help' ئىجرا قىلىنسا بۇيرۇق قۇرى تاللانمىسىنىڭ تولۇق تىزىمى كۆرۈنىدۇ."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "ياپ(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "‹%s› كىرىش ئۈچۈن ئىشلەتكۈچى نامى ۋە مەخپىي نومۇر كېرەك"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "شويلىلىغۇچ تېپىلمىدى"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "شويلىلىغۇچ چېتىلغانمۇ توكى ئۇلانغانمۇ تەكشۈرۈڭ"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr "باشقا يۇمشاق دېتاللار زۆرۈر"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr "شويلىلىغۇچ ئۈچۈن قوزغاتقۇ دېتاللىرىنى ئورنىتىشىڭىز كېرەك."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "باشقا ئاتتا ساقلا…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "ئەمەلدىن قالدۇر(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "ساقلا(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "شويلىلانغان Document.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "سۈرەت ھۆججەتلىرى"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "بارلىق ھۆججەتلەر"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (كۆپ بەتلىك پۈتۈكلەر)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (پرېسلانغان)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (خورىماس)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "ھۆججەت پىچىمى'"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "ھۆججەتكە ساقلىغىلى بولمىدى"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "ئۆزگەرتىشنى تاشلىۋەت"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "ئالدىن كۆرىدىغان رەسىمنى ساقلىغىلى بولمىدى."
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "رەسىمنى ئالدىن كۆرۈش پروگراممىسىنى قوزغاتقىلى بولمىدى"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش(ئەسكىچە)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "ئەكسىچە"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "ئۆزگەرمىسۇن"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -541,16 +566,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/> دا تاپالايسىز."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "«ئاددىي شويلىلاش» ھەققىدە"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "ئاددىي پۈتۈك شويلىلاش قورالى"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -564,189 +589,189 @@ msgstr ""
 "  umar tumur https://launchpad.net/~umar-tumur"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "ساقلىماي ئاخىرلاشتۇر"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "قوزغاتقۇلارنى ئورنىتىش"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "ئورنىتىلغاندىن كېيىن Simple Scan نى قايتا قوزغىتىش زۆرۈر"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "قوزغاتقۇلارنى ئورنىتىۋاتىدۇ…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "قوزغاتقۇلار مۇۋەپپەقىيەتلىك ئورنىتىلدى"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr "قوزغاتقۇلار ئورنىتىش مەغلۇپ بولدى."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (كۆڭۈلدىكى)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (دەسلەپكى نۇسخا)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "يېڭى پۈتۈك"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "پۈتۈك"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "ئېلخەت…"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "باس…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "ياردەم"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "ھەققىدە"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "ئاخىرلاشتۇر"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "شويلىلىغۇچنى ئالماشتۇرۇڭ(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "قوزغاتقۇلارنى ئورنات(_I)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "قارىراق"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "يورۇقراق"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "كىچىك"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "ئەڭ كىچىك"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "ئەڭ چوڭ"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "پۈتۈكنى ساقلاۋاتىدۇ…"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "ساقلاۋاتقىنى %d/%d - بەت"
diff --git a/po/uk.gmo b/po/uk.gmo
deleted file mode 100644
index 48b4f62..0000000
--- a/po/uk.gmo
+++ /dev/null
diff --git a/po/uk.po b/po/uk.po
index fd5b721..aa96b20 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Уповноваження"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Користувач ресурсу:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Пароль:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Передній і зворотний боки"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Передній бік"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Зворот"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Просте сканування"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "Д_окумент"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "С_канування"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "Одинарна _сторінка"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Всі сторінки з _лотка"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "П_рипинити сканування"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Текстовий"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Фотографія"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Перевпорядкувати сторінки"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Надіслати ел. поштою"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "С_торінка"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Обернути _ліворуч"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Обернути п_раворуч"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Обрізати"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Без обрізання"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Нетипові"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Обернути область обрізання"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "Пересунути ліворуч"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "Пересунути праворуч"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Довідка"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Вміст"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Почати новий документ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Створити"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "Сканувати одну сторінку"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Сканувати"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Зберегти"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "Припинити поточне сканування"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Зупинити"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Обернути ліворуч"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "Обернути праворуч"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "Обрізати позначену сторінку"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Обрізати"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Налаштування"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "_Джерело даних сканування:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "Роздільна здатність _тексту:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "Роздільна здатність _фотографій:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Бік сканування:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Розмір сторінки:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Яскравість:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Контрастність:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Якість:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Засіб для сканування документів"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Сканувати документи"
 
@@ -309,7 +323,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -322,7 +336,7 @@ msgstr ""
 "експортування даних до PDF та зберігання даних у файлах зображень "
 "різноманітних форматів."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -330,195 +344,206 @@ msgstr ""
 "SANE."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Не вдалося виявити жодного сканера. Будь ласка, з’єднайте сканер з "
 "комп’ютером."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Не вдалося з’єднатися зі сканером"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Не вдалося розпочати сканування"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "Помилка під час спроби обміну даними зі сканером"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Показати версію випуску"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Показувати діагностичні повідомлення"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Помилка сканування"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ПРИСТРІЙ...] — програма для сканування"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Виконайте « %s --help», щоб побачити повний перелік доступних параметрів "
 "командного рядка."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "За_крити"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступу до «%s» слід вказати ім’я користувача та пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr "Потрібне додаткове програмне забезпечення"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr "Вам слід встановити драйвер до вашого сканера."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "З_берегти"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Файли зображень"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Всі файли"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (багатосторінковий документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (стиснений)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (без втрат)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "Формат файлів:"
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "Не вдалося зберегти файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "Не вдалося зберегти зображення для попереднього перегляду"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "З’єднувати збоку"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "З’єднувати збоку (у зворотному порядку)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "У зворотному порядку"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Не змінювати"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -547,16 +572,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -567,22 +592,22 @@ msgstr ""
 "  Микола Ткач https://launchpad.net/~stuartlittle1970"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr "Здається, у вас сканер Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -591,12 +616,12 @@ msgstr ""
 "Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr "Здається, у вас сканер Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -605,17 +630,17 @@ msgstr ""
 "href=\"http://samsung.com/support\">сайта Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr "Здається, у вас сканер HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr "Здається, у вас сканер Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -624,138 +649,138 @@ msgstr ""
 "сайті Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "Встановлення драйверів"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Після встановлення драйверів, вам слід перезапустити Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "Встановлюємо драйвери…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "Драйвери успішно встановлено!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не вдалося встановити драйвери (код помилки %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr "Не вдалося встановити драйвери."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Необхідно встановити пакунок(-и) %s."
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d т/д (висока роздільність)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d т/д"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Новий документ"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Надіслати ел. поштою…"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Надрукувати…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Довідка"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Про програму"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Вийти"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "_Встановити драйвери"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "темніше"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "світліше"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "менше"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "більше"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Мінімальна"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Максимальна"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Збереження документа…"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Зберігаємо сторінку %d з %d"
diff --git a/po/ur.gmo b/po/ur.gmo
deleted file mode 100644
index 01bd49b..0000000
--- a/po/ur.gmo
+++ /dev/null
diff --git a/po/ur.po b/po/ur.po
index dee9770..c348bff 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "پیچھے"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr ""
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr ""
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "عبارت"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "تصویر"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "نیا"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "محفوظ کریں"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "رکیۓ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "ترجیحات"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,196 +330,207 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -540,189 +565,189 @@ msgstr ""
 "  Shoaib Mirza https://launchpad.net/~monymirza"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/uz.gmo b/po/uz.gmo
deleted file mode 100644
index 28dc6dd..0000000
--- a/po/uz.gmo
+++ /dev/null
diff --git a/po/uz.po b/po/uz.po
index cd69683..e919374 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: uz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Maxfiy soʻz:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Olidi va Orqasi"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Oldingi"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Orqaga"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "_Skan qilish"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr ""
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Matn"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Rasm"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Chapga burish"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "_O'nga burish"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Kesish"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Yoʻq"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Xat"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Yordam"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Tarkibi"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Yangi"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Skan qilish"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Saqlash"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "Toʻxtatish"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "Chapga burish"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "O'nga burish"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Kesish"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Мослашлар"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,198 +330,209 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Релиз версиясини кўрсатиш"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Дебаг хабарларини  чоп қилиш"
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Мавжуд буйруқлар ва мосламаларнинг тўлиқ рўйхатини кўриш учун '%s --help''ни "
 "ишга туширинг."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Hamma fayllar"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -524,205 +549,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Simple Scan haqida"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Saqlamasdan chiqib ketish"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "_Skaner almashrirish"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/vi.gmo b/po/vi.gmo
deleted file mode 100644
index e1bedaa..0000000
--- a/po/vi.gmo
+++ /dev/null
diff --git a/po/vi.po b/po/vi.po
index f215d14..8c44872 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,298 +7,312 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 09:09+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
+"PO-Revision-Date: 2017-03-29 06:42+0000\n"
+"Last-Translator: Vu Do Quynh <vdquynh@gmail.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Xác thực"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
-msgstr ""
+msgstr "_Username cho tài nguyên:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Mật khẩu:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
-msgstr ""
+msgstr "Hai mặt trang"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
-msgstr ""
+msgstr "Mặt trước"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
-msgstr ""
+msgstr "Mặt sau"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Quét đơn giản"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "_Tài liệu"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
-msgstr ""
+msgstr "Q_uét"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "Trang Đơn"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Tất cả trang từ _Khay (Feeder)"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
-msgstr ""
+msgstr "_Dừng Quét hình"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "Văn bản"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "Ảnh chụp"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
-msgstr ""
+msgstr "_Thư điện tử"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Trang"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Xoay _trái"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Xoay _Phải"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Xén"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Không có"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "Tự _chọn"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "_Xoay phần Xén trên màn hình (_Rotate Crop)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
-msgstr ""
+msgstr "Sang trái"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
-msgstr ""
+msgstr "Sang phải"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Trợ giúp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
-msgstr ""
+msgstr "_Nội dung"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
-msgstr ""
+msgstr "Bắt đầu tài liệu mới"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
-msgstr ""
+msgstr "Mới"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
-msgstr ""
+msgstr "Quét một trang đơn từ máy quét hình"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
-msgstr ""
+msgstr "Quét"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
-msgstr ""
+msgstr "Ghi tài liệu ra tệp"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
-msgstr ""
+msgstr "Lưu"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Dừng quét hình"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
-msgstr ""
+msgstr "Dừng"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Xoay trang hướng bên trái (đi ngược kim đồng hồ)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
-msgstr ""
+msgstr "Xoay trái"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Xoay trang hướng bên phải (đi theo kim đồng hồ)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
-msgstr ""
+msgstr "Xoay phải"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Xén trang đã chọn"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
-msgstr ""
+msgstr "Xén"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Tùy thích"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Quét _Nguồn:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Độ Phân giải _Văn bản"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "Độ _Phân giải Ảnh"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
-msgstr ""
+msgstr "Quét mặt:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
-msgstr ""
+msgstr "Cỡ trang:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Độ sáng:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Độ tương phản:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Chất lượng:"
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
-msgstr ""
+msgstr "Quét tài liệu"
 
 #: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
@@ -308,7 +322,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -316,198 +330,209 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Không có máy quét hình. Vui lòng nối máy quét hình."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 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.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Không quét hình được"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 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
+#: 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
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "In ra thông tin gỡ lỗi"
 
-#: ../src/simple-scan.vala:26
+#: 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.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Quét hình thất bại"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Công cụ quét hình"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 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."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, 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.vala:375
+#: src/ui.vala:389
 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.vala:377
+#: src/ui.vala:391
 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"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "Lưu thành..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Tài liệu quét.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
-msgstr ""
+msgstr "Tệp Hình ảnh"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
-msgstr ""
+msgstr "Tất cả Tệp"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (tài liệu nhiều trang)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (nén)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (giữ chất lượng)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 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.vala:673
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Nếu không lưu, các thay đổi sẽ bị mất hoàn toàn."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:763
 msgid "Save current document?"
-msgstr ""
+msgstr "Lưu tài liệu hiện tại?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
-msgstr ""
+msgstr "Bỏ qua Thay đổi"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Không mở được ứng dụng xem thử hình trước"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Không thể mở tập tin trợ giúp"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -536,16 +561,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Công cụ đơn giản để quét tài liệu"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -554,189 +579,189 @@ msgstr ""
 "  Vu Do Quynh https://launchpad.net/~vu-do-quynh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Lưu tài liệu trước khi thoát?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Thoát không Lưu"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
-msgstr ""
+msgstr "%d dpi (mặc định)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d dpi (nháp)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (độ phân giải cao)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Thay đổi thiết bị _Quét hình"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
-msgstr ""
+msgstr "Tự động"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Tối hơn"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
deleted file mode 100644
index c7ff543..0000000
--- a/po/zh_CN.gmo
+++ /dev/null
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 897a632..954864b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,514 +1,305 @@
 # Chinese (Simplified) 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.
+# Mingcong Bai <jeffbai@aosc.xyz>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2012-09-20 08:05+0000\n"
-"Last-Translator: Dennis Kuang <Unknown>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-10-21 20:32+0800\n"
+"PO-Revision-Date: 2017-09-02 01:35+0800\n"
+"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
-"Language: zh_CN\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "认证(_A)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:1
+msgid "Device to scan from"
+msgstr "扫描设备"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "资源用户名(_U)："
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:2
+msgid "SANE device to acquire images from."
+msgstr "从 SANE 设备获取图像。"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "密码(_P)："
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:3
+msgid "Type of document being scanned"
+msgstr "扫描文档的类型"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "正面和背面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:4
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "正面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:5
+msgid "Width 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:196
-msgid "Back"
-msgstr "背面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:6
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
 
-#. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
-msgid "Simple Scan"
-msgstr "扫描易"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:7
+msgid "Height of paper in tenths of a mm"
+msgstr "纸张的高度 (以 0.1mm 计)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "文档(_D)"
-
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "扫描(_A)"
-
-#. Scan menu item to scan a single page from the scanner
-#. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
-msgid "Single _Page"
-msgstr "单页(_P)"
-
-#. Scan menu item to scan all pages from a document feeder
-#. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
-msgid "All Pages From _Feeder"
-msgstr "传送来的所有页面(_F)"
-
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "停止扫描(_S)"
-
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
-msgid "Text"
-msgstr "文本"
-
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
-msgid "Photo"
-msgstr "照片"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:8
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
 
-#. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
-msgid "Reorder Pages"
-msgstr "重新排序页面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:9
+msgid "Brightness of scan"
+msgstr "扫描亮度"
 
-#. Label on email menu item
-#: data/simple-scan.ui:367
-msgid "_Email"
-msgstr "电子邮件(_E)"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
-msgid "_Page"
-msgstr "页面(_P)"
-
-#. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
-msgid "Rotate _Left"
-msgstr "向左旋转(_L)"
-
-#. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
-msgid "Rotate _Right"
-msgstr "向右旋转(_R)"
-
-#. Label for page crop submenu
-#: data/simple-scan.ui:460
-msgid "_Crop"
-msgstr "剪裁(_C)"
-
-#. Radio button for no crop
-#: data/simple-scan.ui:470
-msgid "_None"
-msgstr "无(_N)"
-
-#. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
-msgid "A_4"
-msgstr "A_4"
-
-#. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
-msgid "A_5"
-msgstr "A_5"
-
-#. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
-msgid "A_6"
-msgstr "A_6"
-
-#. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
-msgid "_Letter"
-msgstr "信件(_L)"
-
-#. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
-msgid "Le_gal"
-msgstr "法定(_G)"
-
-#. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
-msgid "4×6"
-msgstr "4×6"
-
-#. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
-msgid "_Custom"
-msgstr "自定义(_C)"
-
-#. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
-msgid "_Rotate Crop"
-msgstr "旋转剪裁(_R)"
-
-#. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
-msgid "Move Left"
-msgstr "左移"
-
-#. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
-msgid "Move Right"
-msgstr "右移"
-
-#. Label on help menu
-#: data/simple-scan.ui:624
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#. Help|Contents menu
-#: data/simple-scan.ui:632
-msgid "_Contents"
-msgstr "内容(_C)"
-
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "开始一个新的文档"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "新建"
-
-#. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
-msgid "Scan a single page from the scanner"
-msgstr "从扫描仪扫描一个单页"
-
-#. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
-msgid "Scan"
-msgstr "扫描"
-
-#. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
-msgid "Save document to a file"
-msgstr "将文档保存为文件"
-
-#: ../src/ui.vala:1842
-msgid "Save"
-msgstr "保存"
-
-#. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
-msgid "Stop the current scan"
-msgstr "停止当前扫描"
-
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
-msgid "Stop"
-msgstr "停止"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:10
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "左旋页面 (逆时针)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:11
+msgid "Contrast of scan"
+msgstr "扫描对比度"
 
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "逆时针旋转"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:12
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "右旋页面 (顺时针)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:13
+msgid "Resolution for text scans"
+msgstr "文本扫描分辨率"
 
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "顺时针旋转"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:14
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "上次扫描文档的分辨率 (点/英寸)。"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "裁剪选中的页面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:15
+msgid "Resolution for photo scans"
+msgstr "照片扫描分辨率"
 
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "剪裁"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:16
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "扫描照片时使用的分辨率 (点/英寸)。"
 
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "首选项"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:17
+msgid "Page side to scan"
+msgstr "扫描纸张的哪面"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "扫描来源(_O)："
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "文字分辨率(_T)："
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "图像分辨率(_P)："
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "扫描页面："
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "页面大小："
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "亮度："
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "对比度："
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "质量："
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "文档扫描仪"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "扫描文档"
-
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
-
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:18
+msgid "The page side to scan."
+msgstr "要扫描的页面。"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"一个非常简单的方法来同时扫描文档和照片。如果图片显示有误，您可以根据需要通过裁剪、旋转等方式调整照片。您也可以打印扫描件、导出 PDF "
-"格式、或者保存为图片。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:19
+msgid "Directory to save files to"
+msgstr "保存文件的文件夹："
 
-#: data/simple-scan.appdata.xml.in:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:20
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr "扫描易使用 SANE 框架支持大多数现有的扫描仪。"
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "没有可用的扫描仪。请连接一个扫描仪。"
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "无法连接到扫描仪"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "无法开始扫描"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-msgid "Error communicating with scanner"
-msgstr "与扫描仪通信错误"
-
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "显示版本信息"
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "显示调试信息"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:21
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG 压缩质量"
 
-#: ../src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr "修复旧版扫描易生成的 PDF 文件"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:22
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG 压缩质量"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "扫描失败"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:23
+msgid "Delay in millisecond between pages"
+msgstr "每页间延迟的毫秒数"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[设备...] - 扫描工具"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:24
+msgid "Delay in millisecond between pages."
+msgstr "每页间延迟的毫秒数。"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: ../src/app-window.vala:237 ../src/app-window.vala:1380
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: ../src/app-window.vala:246
 #, c-format
-msgid "Username and password required to access '%s'"
-msgstr "使用“%s”需要用户名和密码"
+msgid "Username and password required to access “%s”"
+msgstr "访问“%s”需要用户名和密码"
+
+#. Label shown when detected a scanner
+#: ../src/app-window.vala:266 ../src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "扫描准备就绪"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "需要安装其他软件"
+
+#. Instructions to install driver software
+#: ../src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr "您需要为您的扫描仪 <a href=\"install-firmware\"></a> 安装驱动软件。"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: ../src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: ../src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "需要安装其他软件"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "您需要为扫描仪安装驱动程序。"
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "保存为..."
+#: ../src/app-window.vala:298
+msgid "Save As…"
+msgstr "保存为…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: ../src/app-window.vala:301 ../src/app-window.vala:471
+#: ../src/app-window.vala:552
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: ../src/app-window.vala:302 ../src/app-window.vala:553
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: ../src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: ../src/app-window.vala:316
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/app-window.vala:326
 msgid "All Files"
 msgstr "所有文件"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: ../src/app-window.vala:335
 msgid "PDF (multi-page document)"
-msgstr "PDF (多页文档)"
+msgstr "PDF（多页文档）"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: ../src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr "JPEG (压缩)"
+msgstr "JPEG（压缩）"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: ../src/app-window.vala:347
 msgid "PNG (lossless)"
-msgstr "PNG (无损)"
+msgstr "PNG（无损）"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: ../src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP（压缩）"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: ../src/app-window.vala:364
 msgid "File format:"
 msgstr "文件格式："
 
+#. Label in save dialog beside compression slider
+#: ../src/app-window.vala:376
+msgid "Compression:"
+msgstr "压缩模式："
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: ../src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "文件“%s”已存在。要替换该文件吗？"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: ../src/app-window.vala:473
+msgid "_Replace"
+msgstr "替换(_R)"
+
+#: ../src/app-window.vala:512
+msgid "Saving"
+msgstr "正在保存"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: ../src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "保存文件错误"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: ../src/app-window.vala:550
+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:708
+#: ../src/app-window.vala:591
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: ../src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "放弃更改"
 
+#. Label shown when scan started
+#: ../src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "正在访问扫描仪…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: ../src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: ../src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
+#. Title of dialog to reorder pages
+#: ../src/app-window.vala:967 ../src/app-window.vala:1590
+msgid "Reorder Pages"
+msgstr "重新排序页面"
+
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: ../src/app-window.vala:990
 msgid "Combine sides"
 msgstr "合并页"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: ../src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "合并页(反向)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: ../src/app-window.vala:1010
 msgid "Reverse"
 msgstr "反向"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: ../src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "保持不变"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: ../src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: ../src/app-window.vala:1271
 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"
@@ -534,18 +325,20 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: ../src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: ../src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.vala:1487
+#: ../src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Mingcong Bai <jeffbai@aosc.xyz>, 2017.\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
 "  Aron Xu https://launchpad.net/~happyaron\n"
@@ -565,197 +358,574 @@ msgstr ""
 "  zixue.liu https://launchpad.net/~zixue"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: ../src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: ../src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: ../src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一个 Brother 扫描仪。"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: ../src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
-msgstr "该驱动程序可在 <a href=\"http://support.brother.com\">兄弟网站</a>获得。"
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+"该驱动程序可在 <a href=\"http://support.brother.com\">兄弟网站</a>获得。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: ../src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一个 Samsung 扫描仪。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: ../src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
-msgstr "该驱动程序可在<a href=\"http://samsung.com/support\">三星网站</a>获得。"
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+"该驱动程序可在<a href=\"http://samsung.com/support\">三星网站</a>获得。"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: ../src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一个 HP 扫描仪。"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: ../src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一个 Epson 扫描仪。"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: ../src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
-msgstr "该驱动程序可在<a href=\"http://support.epson.com\">爱普生网站</a>获得。"
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+"该驱动程序可在<a href=\"http://support.epson.com\">爱普生网站</a>获得。"
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: ../src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "安装驱动"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: ../src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "安装完成后，需要重新启动扫描易。"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "安装驱动程序…"
+#: ../src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "正在安装驱动程序…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: ../src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "成功安装驱动程序！"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: ../src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "无法安装驱动程序(错误码 %d)。"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: ../src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "安装驱动失败。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: ../src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "您需要安装 %s 软件包。"
+
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: ../src/app-window.vala:1560
+msgid "Simple Scan"
+msgstr "扫描易"
+
+#: ../src/app-window.vala:1568 ../src/app-window.vala:1591
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
+
+#: ../src/app-window.vala:1573
+msgid "Help"
+msgstr "帮助"
+
+#: ../src/app-window.vala:1574
+msgid "About"
+msgstr "关于"
+
+#: ../src/app-window.vala:1575
+msgid "Quit"
+msgstr "退出"
+
+#: ../src/app-window.vala:1589
+msgid "Email"
+msgstr "电子邮件"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: ../src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "重新扫描…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "左旋页面 (逆时针)"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "右旋页面 (顺时针)"
+
+#. Tooltip for crop button
+#: ../src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "裁剪选中的页面"
+
+#. Tooltip for delete button
+#: ../src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "删除选中的页面"
+
+#. Text of button for cancelling save
+#: ../src/app-window.vala:1814
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/book.vala:331 ../src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "您需要安装 %s 包。"
+msgid "Unable to encode page %i"
+msgstr "无法编码页面 %i"
+
+#. Combo box value for automatic paper size
+#: ../src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "自动"
+
+#: ../src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "较深"
+
+#: ../src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "稍浅"
+
+#: ../src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "较少"
+
+#: ../src/preferences-dialog.vala:128
+msgid "More"
+msgstr "更多"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: ../src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: ../src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: ../src/preferences-dialog.vala:446
 #, 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:1793
+#: ../src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "新文档"
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "没有可用的扫描仪。请连接一个扫描仪。"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "文档"
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "无法连接到扫描仪"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "电子邮件..."
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "无法开始扫描"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "打印..."
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1240 ../src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "与扫描仪通信错误"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "帮助"
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "显示版本信息"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "关于"
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "显示调试信息"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "退出"
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "修复旧版扫描易生成的 PDF 文件"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "更换扫描仪(_S)"
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "扫描失败"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "安装驱动(_I)"
+#. Attempt to inhibit the screensaver when scanning
+#: ../src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "正在扫描"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "自动"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[设备…] — 扫描工具"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "较深"
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "稍浅"
+#~ msgid "Scan Documents"
+#~ msgstr "扫描文档"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "较少"
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "简单的文档和照片扫描软件。如果图片显示有误，您可以根据需要通过裁剪、旋转等"
+#~ "方式调整照片。您也可以打印扫描件、导出 PDF 格式、或者保存为图片。"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "更多"
+#~ msgid ""
+#~ "Simple Scan uses the SANE framework to support most existing scanners."
+#~ msgstr "扫描易使用 SANE 框架支持大多数现有的扫描仪。"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "最小值"
+#~ msgid "Document Scanner"
+#~ msgstr "文档扫描仪"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "最大值"
+#~ msgid "scan;scanner;flatbed;adf;"
+#~ msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "正在保存文档..."
+#~ msgid "scanner"
+#~ msgstr "扫描仪"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "正在保存 %d/%d 页"
+#~ msgid "Single _Page"
+#~ msgstr "单页(_P)"
+
+#~ msgid "All Pages From _Feeder"
+#~ msgstr "传送来的所有页面(_F)"
+
+#~ msgid "_Multiple Pages From Flatbed"
+#~ msgstr "来自扫描床的多个页面(_M)"
+
+#~ msgid "Text"
+#~ msgstr "文本"
+
+#~ msgid "Photo"
+#~ msgstr "照片"
+
+#~ msgid "_Document"
+#~ msgstr "文档(_D)"
+
+#~ msgid "Sc_an"
+#~ msgstr "扫描(_A)"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "停止扫描(_S)"
+
+#~ msgid "_Email"
+#~ msgstr "电子邮件(_E)"
+
+#~ msgid "_Page"
+#~ msgstr "页面(_P)"
+
+#~ msgid "Rotate _Left"
+#~ msgstr "向左旋转(_L)"
+
+#~ msgid "Rotate _Right"
+#~ msgstr "向右旋转(_R)"
+
+#~ msgid "_Crop"
+#~ msgstr "剪裁(_C)"
+
+#~ msgid "_None"
+#~ msgstr "无(_N)"
+
+#~ msgid "A_4"
+#~ msgstr "A_4"
+
+#~ msgid "A_5"
+#~ msgstr "A_5"
+
+#~ msgid "A_6"
+#~ msgstr "A_6"
+
+#~ msgid "_Letter"
+#~ msgstr "信件(_L)"
+
+#~ msgid "Le_gal"
+#~ msgstr "法定(_G)"
+
+#~ msgid "4×6"
+#~ msgstr "4×6"
+
+#~ msgid "_Custom"
+#~ msgstr "自定义(_C)"
+
+#~ msgid "_Rotate Crop"
+#~ msgstr "旋转剪裁(_R)"
+
+#~ msgid "Move Left"
+#~ msgstr "左移"
+
+#~ msgid "Move Right"
+#~ msgstr "右移"
+
+#~ msgid "_Help"
+#~ msgstr "帮助(_H)"
+
+#~ msgid "_Contents"
+#~ msgstr "内容(_C)"
+
+#~ msgid "Scan a single page from the scanner"
+#~ msgstr "从扫描仪扫描一个单页"
+
+#~ msgid "Scan"
+#~ msgstr "扫描"
+
+#~ msgid "Save document to a file"
+#~ msgstr "将文档保存为文件"
+
+#~ msgid "Save"
+#~ msgstr "保存"
+
+#~ msgid "Stop the current scan"
+#~ msgstr "停止当前扫描"
+
+#~ msgid "Stop"
+#~ msgstr "停止"
+
+#~ msgid "Searching for Scanners…"
+#~ msgstr "正在探测扫描仪…"
+
+#~ msgid "_Authorize"
+#~ msgstr "认证(_A)"
+
+#~ msgid "_Username for resource:"
+#~ msgstr "资源用户名(_U)："
+
+#~ msgid "_Password:"
+#~ msgstr "密码(_P)："
+
+#~ msgctxt "shortcut window"
+#~ msgid "Scanning"
+#~ msgstr "正在扫描"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Scan a single page"
+#~ msgstr "单页扫描"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Scan all pages from document feeder"
+#~ msgstr "扫描所有页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Scan continuously from a flatbed scanner"
+#~ msgstr "连续扫描平板扫描仪上的页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Stop scan in progress"
+#~ msgstr "中止正在进行的扫描"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Document Modification"
+#~ msgstr "修改文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move page left"
+#~ msgstr "左移页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move page right"
+#~ msgstr "右移页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Rotate page to the left (anti-clockwise)"
+#~ msgstr "逆时针旋转页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Rotate page to the right (clockwise)"
+#~ msgstr "顺时针旋转页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete page"
+#~ msgstr "删除页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Document Management"
+#~ msgstr "文档管理"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Start new document"
+#~ msgstr "创建新文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Save scanned document"
+#~ msgstr "保存已扫描的文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Email scanned document"
+#~ msgstr "使用电子邮件发送已扫描的文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Print scanned document"
+#~ msgstr "打印已扫描的文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Copy current page to clipboard"
+#~ msgstr "将当前页面复制到剪贴板"
+
+#~ msgid "_Scanner"
+#~ msgstr "扫描仪(_S)"
+
+#~ msgid "Scan Sides"
+#~ msgstr "扫描面"
+
+#~ msgid "Page Size"
+#~ msgstr "页面大小"
+
+#~ msgid "Front"
+#~ msgstr "正面"
+
+#~ msgid "Back"
+#~ msgstr "背面"
+
+#~ msgid "Both"
+#~ msgstr "双面"
+
+#~ msgid "Delay"
+#~ msgstr "延迟"
+
+#~ msgid "Multiple pages from flatbed"
+#~ msgstr "来自扫描床的多个页面"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "10"
+#~ msgstr "10"
+
+#~ msgid "15"
+#~ msgstr "15"
+
+#~ msgid "Seconds"
+#~ msgstr "秒"
+
+#~ msgid "Scanning"
+#~ msgstr "正在扫描"
+
+#~ msgid "_Text Resolution"
+#~ msgstr "文字分辨率(_T)"
+
+#~ msgid "_Photo Resolution"
+#~ msgstr "图像分辨率(_P)"
+
+#~ msgid "Brightness"
+#~ msgstr "亮度"
+
+#~ msgid "Contrast"
+#~ msgstr "对比度"
+
+#~ msgid "Quality"
+#~ msgstr "质量"
+
+#~ msgid "Front and Back"
+#~ msgstr "正面和背面"
+
+#~ msgid "New"
+#~ msgstr "新建"
+
+#~ msgid "Rotate Left"
+#~ msgstr "逆时针旋转"
+
+#~ msgid "Rotate Right"
+#~ msgstr "顺时针旋转"
+
+#~ msgid "Crop"
+#~ msgstr "剪裁"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "扫描来源(_O)："
+
+#~ msgid "New Document"
+#~ msgstr "新文档"
+
+#~ msgid "Document"
+#~ msgstr "文档"
+
+#~ msgid "Email..."
+#~ msgstr "电子邮件..."
+
+#~ msgid "Print..."
+#~ msgstr "打印..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "安装驱动(_I)"
+
+#~ msgid "Minimum"
+#~ msgstr "最小值"
+
+#~ msgid "Maximum"
+#~ msgstr "最大值"
+
+#~ msgid "Saving document..."
+#~ msgstr "正在保存文档..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "正在保存 %d/%d 页"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -769,7 +939,6 @@ msgstr "正在保存 %d/%d 页"
 #~ msgid "Files missing"
 #~ msgstr "文件丢失"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -789,27 +958,25 @@ msgstr "正在保存 %d/%d 页"
 #~ "  --gtk-module=MODULES  加载额外的 GTK+ 模块\n"
 #~ "  --g-fatal-warnings  将所有警告置为致命"
 
-#~ msgid "Device to scan from"
-#~ msgstr "扫描设备"
-
 #~ msgid "Direction of scan"
 #~ 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"
-#~ 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'"
+#~ 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 "扫描文档的类型。“文本”适用于文本文档，“照片”适用于照片。这些设置将会决定扫描分辨率、色彩和预处理。"
+#~ msgstr ""
+#~ "扫描文档的类型。“文本”适用于文本文档，“照片”适用于照片。这些设置将会决定扫"
+#~ "描分辨率、色彩和预处理。"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -831,27 +998,18 @@ msgstr "正在保存 %d/%d 页"
 #~ msgid "Select File _Type"
 #~ msgstr "选择文件类型(_T)"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "文本扫描分辨率"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "照片扫描分辨率"
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "上次扫描图片的分辨率 (点/英寸)。"
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "上次扫描的图片分辨率"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "上次扫描文档的分辨率 (点/英寸)。"
-
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "所扫描图像的的高度 (以像素计)"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr "所扫描图像的宽度 (以像素计)。这是上次扫描的页面的值。"
 
 #~ msgid ""
@@ -859,79 +1017,19 @@ msgstr "正在保存 %d/%d 页"
 #~ "last scanned page was."
 #~ msgstr "所扫描图像的高度 (以像素计)。这是上次扫描的页面的值。"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "从 SANE 设备获取图像。"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "保存文件的文件夹："
-
 #~ msgid "Window height in pixels"
 #~ msgstr "窗口高度 (像素)"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "窗口宽度 (像素)"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "扫描照片时使用的分辨率 (点/英寸)。"
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "所扫描图像的宽度 (以像素计)。"
 
-#~ msgid "Scanned Document"
-#~ msgstr "扫描的文档"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
-
-#~ msgid "Page side to scan"
-#~ msgstr "扫描纸张的哪面"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "纸张的高度 (以 0.1mm 计)"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "纸张的宽度 (以 0.1mm 计)"
-
-#~ msgid "The page side to scan."
-#~ msgstr "要扫描的页面。"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "扫描仪相对于被扫描页面的方向。"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "JPEG 压缩质量"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "扫描对比度"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "扫描亮度"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "JPEG 压缩质量"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"
diff --git a/po/zh_HK.gmo b/po/zh_HK.gmo
deleted file mode 100644
index 24726a6..0000000
--- a/po/zh_HK.gmo
+++ /dev/null
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4239257..5b08c60 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,296 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2015-11-08 20:18+0000\n"
 "Last-Translator: Roy Chan <roy.chan@linux.org.hk>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "授權(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "資源的使用者名稱(_U)："
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "密碼(_P)："
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "正面與背面"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "正面"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "背面"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "簡易掃描"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr "文件(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 msgid "Sc_an"
 msgstr "掃描(_A)"
 
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 msgid "Single _Page"
 msgstr "單一頁面(_P)"
 
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "來自進紙匣的所有頁面(_F)"
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr "停止掃描(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr "文字"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr "相片"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "美規信紙(_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "美規長信紙(Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "求助(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "起始一份新文件"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "新增"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr "從掃描器掃描單一頁面"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "掃描"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr "將文件儲存到檔案"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "儲存"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "將頁面向左旋轉 (逆時針方向)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr "將頁面向右旋轉 (順時針方向)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr "裁切所選的頁面"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "裁切"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "偏好設定"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "掃描來源(_O)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "文字解像度(_T)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "相片解像度(_P)："
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "掃描面："
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "頁面大小："
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "對比度："
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "品質："
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "文件掃描器"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "掃描文件"
 
@@ -308,7 +322,7 @@ msgstr "scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 msgid ""
 "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 "
@@ -317,196 +331,207 @@ msgid ""
 msgstr ""
 "你能輕易地掃描文件和相片。你可以裁剪相片的不良部分並將之旋轉至正確角度。你可以列印你的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "無法連接到掃描器"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "無法起始掃描"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr "與掃描器溝通時發生錯誤"
 
 #. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "顯示發行版本"
 
 #. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "打印除錯訊息"
 
-#: ../src/simple-scan.vala:26
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "需要提供使用者名稱和密碼以存取 '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr "未偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查並確認你的掃描器已連接，並已開啟電源"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr "需要額外軟件"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr "你需要為你的掃描器安裝驅動程式。"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr "另存為..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "已掃描的文件.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "影像檔案"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "所有檔案"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (多頁文件)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (壓縮)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr "PNG (無損)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:564
 msgid "File format:"
 msgstr "檔案格式："
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:721
 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:708
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr "是否儲存至目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "放棄變更"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "合併邊緣"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (反轉)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "反轉"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "維持不變"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "無法開啟求助檔案。"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1525
 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"
@@ -529,16 +554,16 @@ msgstr ""
 "你應已收到附隨於本程式的GNU通用公共授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "關於簡易掃描"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -548,22 +573,22 @@ msgstr ""
 "  tomoe_musashi https://launchpad.net/~musashi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr "你似乎有一部 Brother 掃描器。"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -571,12 +596,12 @@ msgstr ""
 "這部掃描器的驅動程式可以在這裏找到：<a href=\"http://support.brother.com\">Brother 網站</a>。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr "你似乎有一部 Samsung 掃描器。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -584,155 +609,155 @@ msgstr ""
 "這部掃描器的驅動程式可以在這裏找到：<a href=\"http://samsung.com/support\">Samsung 網站</a>。"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr "你似乎有一部 HP 掃描器。"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr "你似乎有一部 Epson 掃描器。"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr "這部掃描器的驅動程式可以在這裏找到：<a href=\"http://support.epson.com\">Epson 網站</a>。"
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "一旦安裝，你將需要重新啟動簡易掃描。"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "正在安裝驅動程式..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr "驅動程式安裝失敗。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "你需要安裝 %s 套件。"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1793
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "新文件"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "文件"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "電子郵件..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "列印..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "協助"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "關於"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "退出"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "安裝驅動程式(_I)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "較暗"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "較光"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "少"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "多"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "儲存文件中..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %d / %d"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
deleted file mode 100644
index 26da286..0000000
--- a/po/zh_TW.gmo
+++ /dev/null
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2525b90..5510e40 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,507 +6,509 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-02-14 11:17+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-24 13:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.13\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "授權(_A)"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "要從哪個裝置掃描"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "資源的使用者名稱(_U)："
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "取得影像用的 SANE 裝置。"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "密碼(_P)："
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "掃描中文件的類型"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "正面與背面"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr "掃描中文件的類型。這個設定值決定掃描的解析度、色彩、後製處理。"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "正面"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "以 0.1 mm 為單位的紙張寬度"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "背面"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width 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:30
+msgid "Height of paper in tenths of a mm"
+msgstr "以 0.1 mm 為單位的紙張高度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"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:35
+msgid "Brightness of scan"
+msgstr "掃描亮度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "掃描反差"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "調整反差，由 -100 至 100 (0 代表無)。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "文字掃描的解析度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "當掃描文字時使用的解析度，單位為 dpi。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "相片掃描的解析度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "當掃描相片時使用的解析度，單位為 dpi。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "要掃描的頁面"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "要掃描的頁面。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "儲存檔案的目錄"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG 壓縮品質"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG 壓縮品質。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "每頁之間的延遲毫秒"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "每頁之間的延遲毫秒數。"
 
 #. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "掃描易"
+msgstr "簡易掃描"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "文件(_D)"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "掃描文件"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "掃描(_A)"
+#: data/simple-scan.appdata.xml.in:9
+msgid ""
+"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."
+msgstr ""
+"您能輕易地掃描文件和相片。您可以裁剪相片的不良部分並將之旋轉至正確角度。您可"
+"以列印您的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "文件掃描"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "單一頁面(_P)"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "來自進紙匣的所有頁面(_F)"
+msgstr "從饋紙器掃描所有頁面(_F)"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "停止掃描(_S)"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "從平臺多頁掃描(_M)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "文字"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "相片"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "文件(_D)"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "掃描(_A)"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "停止掃描(_S)"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "美規信紙(_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "美規長信紙(Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "幫助(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "起始一份新文件"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "新增"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
 msgstr "從掃描器掃描單一頁面"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "掃描"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "儲存"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "停止"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "將頁面向左旋轉 (逆時針方向)"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "正在搜尋掃描器…"
 
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "向左旋轉"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "將頁面向右旋轉 (順時針方向)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "向右旋轉"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "裁切所選的頁面"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "裁切"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "偏好設定"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "掃描來源(_O)："
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "文字解析度(_T)："
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "相片解析度(_P)："
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "掃描面："
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "頁面大小："
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "亮度："
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "反差："
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "品質："
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "文件掃描"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "掃描文件"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "關閉(_C)"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "若要存取「%s」則必須提供使用者名稱與密碼"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "準備掃描"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"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."
-msgstr ""
-"您能輕易地掃描文件和相片。您可以裁剪相片的不良部分並將之旋轉至正確角度。您可以列印您的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "需要額外軟體"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "沒有可用的掃描器。請連接一部掃描器。"
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "無法連接到掃描器"
-
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr "無法起始掃描"
-
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
-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:391
-msgid "Failed to scan"
-msgstr "掃描失敗"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[裝置...] - 掃描公用程式"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "關閉(_C)"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "要存取「%s」需要提供使用者名稱與密碼"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr "您需要為您的掃描器<a href=\"install-firmware\">安裝驅動程式</a>。"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
-msgid "Additional software needed"
-msgstr "需要額外軟體"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "您需要為您的掃描器安裝驅動程式。"
-
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "另存為..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "另存為…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "影像檔"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "所有檔案"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
-msgstr "PDF (多頁文件)"
+msgstr "PDF（多頁文件）"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr "JPEG (壓縮)"
+msgstr "JPEG（壓縮）"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
-msgstr "PNG (無損)"
+msgstr "PNG（無損）"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP（壓縮）"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "檔案格式："
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "壓縮："
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "「%s」檔名已經存在。您是否希望取代該檔案？"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "取代(_R)"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "儲存"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "如果您不儲存，變更將會永久消失。"
+#: src/app-window.vala:550
+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:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "放棄變更"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "正在聯絡掃描器…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "合併邊緣"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (相反次序)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "反轉"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "維持不變"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -521,24 +523,27 @@ 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 "
-"通用公眾授權條款，對本程式再次發佈和/或修改；無論您依據的是本授權的第三版，或（依您的選擇而定）任何較新的版本。\n"
+"本程式為自由軟體；您可依據自由軟體基金會所發表的 GNU 通用公眾授權條款，對本程"
+"式再次發佈和/或修改；無論您依據的是本授權的第三版，或（依您的選擇而定）任何較"
+"新的版本。\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.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "關於「簡易掃描」"
+msgstr "關於《簡易掃描》"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -552,228 +557,523 @@ msgstr ""
 "  tomoe_musashi https://launchpad.net/~musashi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一台 Brother 掃描器。"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://support.brother.com\">Brother 網站</a>。"
+"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://support.brother.com"
+"\">Brother 網站</a>。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一台 Samsung 掃描器。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://samsung.com/support\">Samsung 網站</a>。"
+"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://samsung.com/support"
+"\">Samsung 網站</a>。"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一台 HP 掃描器。"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一台 Epson 掃描器。"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
-msgstr "此裝置的驅動程式可以在 <a href=\"http://support.epson.com\">Epson 網站</a> 上找到。"
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+"此裝置的驅動程式可以在 <a href=\"http://support.epson.com\">Epson 網站</a> 上"
+"找到。"
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "一旦安裝，您將需要重新啟動簡易掃描。"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "正在安裝驅動程式..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "驅動程式安裝失敗。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "要先安裝 %s 套件。"
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "您得先安裝 %s 軟體包。"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤捷徑鍵"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "求助"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "關於"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "結束"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "電子郵件"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "再次開始…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "將頁面向左旋轉 (逆時針方向)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "將頁面向右旋轉 (順時針方向)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "裁切所選的頁面"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "刪除所選頁面"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "取消"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "授權(_A)"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "資源的使用者名稱(_U)："
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "密碼(_P)："
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "無法編碼頁面 %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "掃描"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "掃描單一頁面"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "從饋紙器掃描所有頁面"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "從平臺式掃描器連續掃描"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "停止進行中的掃描"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "文件修改"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "頁面左移"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "頁面右移"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "將頁面向左旋轉（逆時針方向）"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "將頁面向右旋轉（順時針方向）"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "刪除頁面裁切所選的頁面"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "文件管理"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "起始新文件"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "儲存掃描的文件"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "寄送掃描的文件"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "列印掃描的文件"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "複製目前頁面到剪貼簿中"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "掃描器(_S)"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "掃描面"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "頁面大小"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "正面"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "背面"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "雙面"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "延遲"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "從平臺多頁掃描"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "秒"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "掃描"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "文字解析度(_T)"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "相片解析度(_P)"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "亮度"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "對比"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "品質"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "自動"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "較深"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "較淺"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "少"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "多"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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:1793
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "新文件"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "文件"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "無法連接到掃描器"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "電子郵件..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "無法起始掃描"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "列印..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "與掃描器溝通時發生錯誤"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "求助"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "顯示發行版本"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "關於"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "列印除錯訊息"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "結束"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "修正由舊版本簡易掃描產生的 PDF 檔案"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "變更掃描器(_S)"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "掃描失敗"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "安裝驅動程式(_I)"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "掃描進行中"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "自動"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[裝置...] — 掃描公用程式"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "較深"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "較淺"
+#~ msgid "Front and Back"
+#~ msgstr "正面與背面"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "少"
+#~ msgid "New"
+#~ msgstr "新增"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "多"
+#~ msgid "Rotate Left"
+#~ msgstr "向左旋轉"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "最小"
+#~ msgid "Rotate Right"
+#~ msgstr "向右旋轉"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "最大"
+#~ msgid "Crop"
+#~ msgstr "裁切"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "正在儲存文件..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "掃描來源(_O)："
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
+#~ msgid "New Document"
+#~ msgstr "新文件"
+
+#~ msgid "Document"
+#~ msgstr "文件"
+
+#~ msgid "Email..."
+#~ msgstr "電子郵件..."
+
+#~ msgid "Print..."
+#~ msgstr "列印..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "安裝驅動程式(_I)"
+
+#~ msgid "Minimum"
+#~ msgstr "最小"
+
+#~ msgid "Maximum"
+#~ msgstr "最大"
+
+#~ msgid "Saving document..."
+#~ msgstr "正在儲存文件..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#~ msgid "Device to scan from"
-#~ msgstr "要從哪個裝置掃描"
-
 #~ msgid "Direction of scan"
 #~ msgstr "掃描的方向"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "文字掃描的解析度"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "相片掃描的解析度"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "上次掃描影像的解析度"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "儲存檔案的目錄"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "掃描中文件的類型"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "視窗高度，單位為像素"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "視窗寬度，單位為像素"
 
-#~ msgid "Scanned Document"
-#~ msgstr "掃描的文件"
-
 #~ msgid "Select File _Type"
 #~ msgstr "選取檔案類型(_T)"
 
@@ -783,25 +1083,17 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "之前掃描的影像其解析度，單位為 dpi。"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "當掃描文字時使用的解析度，單位為 dpi。"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "當掃描相片時使用的解析度，單位為 dpi。"
-
 #~ 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 "掃描中文件的類型。「文字」表示文字型文件，「相片」表示相片型文件。此設定值會決定掃描解析度、色彩，以及後製處理。"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "取得影像用的 SANE 裝置。"
+#~ msgstr ""
+#~ "掃描中文件的類型。「文字」表示文字型文件，「相片」表示相片型文件。此設定值"
+#~ "會決定掃描解析度、色彩，以及後製處理。"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "如果應用程式視窗最大化時為 TRUE"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -817,7 +1109,6 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ "  --help-all 顯示所有求助選項\n"
 #~ "  --help-gtk 顯示 GTK+ 選項"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -825,7 +1116,6 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ "用法：\n"
 #~ "  %s [裝置...] - 掃瞄工具"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -851,78 +1141,35 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
-#~ msgstr "掃描影像的高度，單位為像素。此數值會根據最近一次掃描頁面的情況更新。"
+#~ msgstr ""
+#~ "掃描影像的高度，單位為像素。此數值會根據最近一次掃描頁面的情況更新。"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr "掃描影像的寬度，單位為像素。此值會根據最近一次掃描頁面的情況更新。"
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "掃描影像的寬度，單位為像素"
 
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr "要掃描的頁面。它可以是下列之一：「both」(兩者)、「front」(正面)、「back」(背面)"
-
-#~ msgid "Page side to scan"
-#~ msgstr "要掃描的頁面"
+#~ "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'"
+#~ "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."
-#~ msgstr "要掃描的頁面。"
+#~ "掃描器橫越掃描頁面的方向。它可以是下列之一：「top-to-bottom」(頂端到底"
+#~ "部)、「bottom-to-top」(底部到頂端)、「left-to-right」(左到右)、「right-to-"
+#~ "left」(右到左)"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "掃描器跨越掃描頁面的方向。"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr "掃描中文件的類型。這個設定值決定掃描的解析度、色彩、後製處理。"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "以 0.1 mm 為單位的紙張高度"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "以 0.1 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "以 0.1 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "以 0.1 mm 為單位的紙張寬度"
-
 #~ msgid "Files missing"
 #~ msgstr "缺少檔案"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "調整反差，由 -100 至 100 (0 代表無)。"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "掃描反差"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "掃描亮度"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "JPEG 壓縮品質。"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "JPEG 壓縮品質"
diff --git a/simple-scan.doap b/simple-scan.doap
index de2ac8e..7d8edca 100644
--- a/simple-scan.doap
+++ b/simple-scan.doap
@@ -6,10 +6,14 @@
 
   <name xml:lang="en">simple-scan</name>
   <shortdesc xml:lang="en">Document Scanning Application</shortdesc>
+  <description xml:lang="en">
+   Simple Scan allows you to get images from a scanner (e.g. a flatbed scanner).
+  </description>
   <homepage rdf:resource="https://launchpad.net/simple-scan" />
   <download-page rdf:resource="http://people.ubuntu.com/~robert-ancell/simple-scan/" />
   <bug-database rdf:resource="https://bugs.launchpad.net/simple-scan" />
-  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
+  <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
+  <programming-language>Vala</programming-language>
 
   <maintainer>
     <foaf:Person>
diff --git a/snap/classic-launch b/snap/classic-launch
new file mode 100755
index 0000000..96452d9
--- /dev/null
+++ b/snap/classic-launch
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if test "$1" = "classic"; then
+    shift
+    case $SNAP_ARCH in
+        amd64)
+            TRIPLET="x86_64-linux-gnu"
+            ;;
+        armhf)
+            TRIPLET="arm-linux-gnueabihf"
+            ;;
+        arm64)
+            TRIPLET="aarch64-linux-gnu"
+            ;;
+        *)
+            TRIPLET="$(uname -p)-linux-gnu"
+            ;;
+    esac
+
+    export LD_LIBRARY_PATH=$SNAP/usr/lib:$SNAP/usr/lib/$TRIPLET:$SNAP/lib/$TRIPLET
+fi
+
+exec ${SNAP}/bin/desktop-launch $@
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 0000000..f13f0b5
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,79 @@
+name: simple-scan
+version: 3.25.90
+summary: Document Scanning Application
+description: |
+  Simple Scan allows you to get images from a scanner (e.g. a flatbed scanner)
+
+grade: devel # must be 'stable' to release into candidate/stable channels
+confinement: classic
+
+apps:
+  simple-scan:
+    command: bin/classic-launch classic ${SNAP}/usr/bin/simple-scan
+    desktop: usr/share/applications/simple-scan.desktop
+    environment:
+      GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
+
+parts:
+  libsane:
+    after: [desktop-gtk3]
+    source: https://anonscm.debian.org/cgit/sane/sane-backends.git
+    source-type: git
+    source-tag: RELEASE_1_0_27
+    plugin: autotools
+    # workaround the issue described in https://launchpad.net/bugs/1583250
+    configflags: [--prefix=/snap/simple-scan/current/usr, --with-api-spec=no]
+    organize:
+      snap/simple-scan/current/usr: usr
+    build-packages:
+      - autotools-dev
+      - autoconf
+      - chrpath
+      - dh-systemd
+      - gettext
+      - libavahi-client-dev
+      - libcups2-dev
+      - libgphoto2-dev
+      - libieee1284-3-dev
+      - libjpeg-dev
+      - libltdl3-dev
+      - libsystemd-dev
+      - libtiff-dev
+      - libusb-1.0-0-dev
+      - pkg-config
+      - po-debconf
+      - xutils-dev
+
+  simple-scan:
+    after: [libsane]
+    source: .
+    plugin: meson
+    meson-parameters: [--prefix=/usr]
+    organize:
+      snap/simple-scan/current/usr: usr
+    install: |
+      mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
+      cp snapbuild/data/simple-scan.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
+    build-packages:
+      - desktop-file-utils
+      - gettext
+      - gnome-common
+      - intltool
+      - itstool
+      - libcairo2-dev
+      - libcolord-dev
+      - libdbus-glib-1-dev
+      - libglib2.0-dev
+      - libgtk-3-dev
+      - libgdk-pixbuf2.0-dev
+      - libgusb-dev
+      - libpackagekit-glib2-dev
+      - libsane-dev
+      - python-scour
+      - valac
+      - zlib1g-dev
+  classic-launch:
+    plugin: dump
+    source: ./snap
+    organize:
+      classic-launch: bin/classic-launch
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 6c2e1ba..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-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 \
-	fixes.vapi \
-	packagekit-glib2.vapi \
-	page.vala \
-	page-view.vala \
-	sane.vapi \
-	simple-scan.vala \
-	scanner.vala \
-	ui.vala \
-	autosave-manager.vala \
-	resources.c
-
-simple_scan_VALAFLAGS = \
-	--pkg=posix \
-	--pkg=zlib \
-	--pkg=gusb \
-	--pkg=gio-2.0 \
-	--pkg=gtk+-3.0 \
-	--gresources=$(top_srcdir)/data/simple-scan.gresource.xml \
-	--debug \
-	--target-glib 2.38
-
-if HAVE_COLORD
-simple_scan_VALAFLAGS += -D HAVE_COLORD
-endif
-
-if HAVE_PACKAGEKIT
-simple_scan_VALAFLAGS += -D HAVE_PACKAGEKIT
-endif
-
-simple_scan_CFLAGS = \
-	-w \
-	$(SIMPLE_SCAN_CFLAGS) \
-	$(COLORD_CFLAGS) \
-	$(PACKAGEKIT_CFLAGS) \
-	$(WARN_CFLAGS) \
-	-DVERSION=\"$(VERSION)\" \
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-	-DLOCALE_DIR=\"$(localedir)\" \
-	-DUI_DIR=\"$(datadir)/simple-scan/\" \
-	-DICON_DIR=\"$(datadir)/simple-scan/icons\" \
-	-DGCONF_DIR=\"/apps/simple-scan\" \
-	-DSIMPLE_SCAN_BINARY=\"simple-scan\" \
-	-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
-
-simple_scan_LDADD = \
-	$(SIMPLE_SCAN_LIBS) \
-	$(COLORD_LIBS) \
-	$(PACKAGEKIT_LIBS) \
-	-lsane \
-	-lm
-
-CLEANFILES = \
-	$(patsubst %.vala,%.c,$(filter %.vala, $(SOURCES))) \
-	resources.c \
-	*_vala.stamp
diff --git a/src/Makefile.in b/src/Makefile.in
deleted file mode 100644
index caf53de..0000000
--- a/src/Makefile.in
+++ /dev/null
@@ -1,888 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) 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 \
-      *\\[\ \	]*) \
-        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; \
-  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@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = simple-scan$(EXEEXT)
-@HAVE_COLORD_TRUE@am__append_1 = -D HAVE_COLORD
-@HAVE_PACKAGEKIT_TRUE@am__append_2 = -D HAVE_PACKAGEKIT
-subdir = src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-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-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) \
-	$(am__DEPENDENCIES_1)
-simple_scan_LINK = $(CCLD) $(simple_scan_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-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_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_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_VALAC_1 = 
-SOURCES = $(simple_scan_SOURCES)
-DIST_SOURCES = $(simple_scan_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    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
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(srcdir)/simple_scan_vala.stamp $(top_srcdir)/depcomp \
-	autosave-manager.c book-view.c book.c page-view.c page.c \
-	scanner.c simple-scan.c ui.c
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPSTREAM_UTIL = @APPSTREAM_UTIL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COLORD_CFLAGS = @COLORD_CFLAGS@
-COLORD_LIBS = @COLORD_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-ITSTOOL = @ITSTOOL@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
-PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMLLINT = @XMLLINT@
-YELP_LC_DIST = @YELP_LC_DIST@
-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-appstreamxmldir = @appstreamxmldir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-simple_scan_SOURCES = \
-	config.vapi \
-	book.vala \
-	book-view.vala \
-	colord.vapi \
-	fixes.vapi \
-	packagekit-glib2.vapi \
-	page.vala \
-	page-view.vala \
-	sane.vapi \
-	simple-scan.vala \
-	scanner.vala \
-	ui.vala \
-	autosave-manager.vala \
-	resources.c
-
-simple_scan_VALAFLAGS = --pkg=posix --pkg=zlib --pkg=gusb \
-	--pkg=gio-2.0 --pkg=gtk+-3.0 \
-	--gresources=$(top_srcdir)/data/simple-scan.gresource.xml \
-	--debug --target-glib 2.38 $(am__append_1) $(am__append_2)
-simple_scan_CFLAGS = \
-	-w \
-	$(SIMPLE_SCAN_CFLAGS) \
-	$(COLORD_CFLAGS) \
-	$(PACKAGEKIT_CFLAGS) \
-	$(WARN_CFLAGS) \
-	-DVERSION=\"$(VERSION)\" \
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-	-DLOCALE_DIR=\"$(localedir)\" \
-	-DUI_DIR=\"$(datadir)/simple-scan/\" \
-	-DICON_DIR=\"$(datadir)/simple-scan/icons\" \
-	-DGCONF_DIR=\"/apps/simple-scan\" \
-	-DSIMPLE_SCAN_BINARY=\"simple-scan\" \
-	-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
-
-simple_scan_LDADD = \
-	$(SIMPLE_SCAN_LIBS) \
-	$(COLORD_LIBS) \
-	$(PACKAGEKIT_LIBS) \
-	-lsane \
-	-lm
-
-CLEANFILES = \
-	$(patsubst %.vala,%.c,$(filter %.vala, $(SOURCES))) \
-	resources.c \
-	*_vala.stamp
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	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; \
-	done | \
-	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 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@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)/' \
-	`; \
-	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)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-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@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-simple_scan-book.o: book.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-book.o -MD -MP -MF $(DEPDIR)/simple_scan-book.Tpo -c -o simple_scan-book.o `test -f 'book.c' || echo '$(srcdir)/'`book.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-book.Tpo $(DEPDIR)/simple_scan-book.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='book.c' object='simple_scan-book.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-book.o `test -f 'book.c' || echo '$(srcdir)/'`book.c
-
-simple_scan-book.obj: book.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-book.obj -MD -MP -MF $(DEPDIR)/simple_scan-book.Tpo -c -o simple_scan-book.obj `if test -f 'book.c'; then $(CYGPATH_W) 'book.c'; else $(CYGPATH_W) '$(srcdir)/book.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-book.Tpo $(DEPDIR)/simple_scan-book.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='book.c' object='simple_scan-book.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-book.obj `if test -f 'book.c'; then $(CYGPATH_W) 'book.c'; else $(CYGPATH_W) '$(srcdir)/book.c'; fi`
-
-simple_scan-book-view.o: book-view.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-book-view.o -MD -MP -MF $(DEPDIR)/simple_scan-book-view.Tpo -c -o simple_scan-book-view.o `test -f 'book-view.c' || echo '$(srcdir)/'`book-view.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-book-view.Tpo $(DEPDIR)/simple_scan-book-view.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='book-view.c' object='simple_scan-book-view.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-book-view.o `test -f 'book-view.c' || echo '$(srcdir)/'`book-view.c
-
-simple_scan-book-view.obj: book-view.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-book-view.obj -MD -MP -MF $(DEPDIR)/simple_scan-book-view.Tpo -c -o simple_scan-book-view.obj `if test -f 'book-view.c'; then $(CYGPATH_W) 'book-view.c'; else $(CYGPATH_W) '$(srcdir)/book-view.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-book-view.Tpo $(DEPDIR)/simple_scan-book-view.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='book-view.c' object='simple_scan-book-view.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-book-view.obj `if test -f 'book-view.c'; then $(CYGPATH_W) 'book-view.c'; else $(CYGPATH_W) '$(srcdir)/book-view.c'; fi`
-
-simple_scan-page.o: page.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-page.o -MD -MP -MF $(DEPDIR)/simple_scan-page.Tpo -c -o simple_scan-page.o `test -f 'page.c' || echo '$(srcdir)/'`page.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-page.Tpo $(DEPDIR)/simple_scan-page.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='page.c' object='simple_scan-page.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-page.o `test -f 'page.c' || echo '$(srcdir)/'`page.c
-
-simple_scan-page.obj: page.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-page.obj -MD -MP -MF $(DEPDIR)/simple_scan-page.Tpo -c -o simple_scan-page.obj `if test -f 'page.c'; then $(CYGPATH_W) 'page.c'; else $(CYGPATH_W) '$(srcdir)/page.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-page.Tpo $(DEPDIR)/simple_scan-page.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='page.c' object='simple_scan-page.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-page.obj `if test -f 'page.c'; then $(CYGPATH_W) 'page.c'; else $(CYGPATH_W) '$(srcdir)/page.c'; fi`
-
-simple_scan-page-view.o: page-view.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-page-view.o -MD -MP -MF $(DEPDIR)/simple_scan-page-view.Tpo -c -o simple_scan-page-view.o `test -f 'page-view.c' || echo '$(srcdir)/'`page-view.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-page-view.Tpo $(DEPDIR)/simple_scan-page-view.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='page-view.c' object='simple_scan-page-view.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-page-view.o `test -f 'page-view.c' || echo '$(srcdir)/'`page-view.c
-
-simple_scan-page-view.obj: page-view.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-page-view.obj -MD -MP -MF $(DEPDIR)/simple_scan-page-view.Tpo -c -o simple_scan-page-view.obj `if test -f 'page-view.c'; then $(CYGPATH_W) 'page-view.c'; else $(CYGPATH_W) '$(srcdir)/page-view.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-page-view.Tpo $(DEPDIR)/simple_scan-page-view.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='page-view.c' object='simple_scan-page-view.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-page-view.obj `if test -f 'page-view.c'; then $(CYGPATH_W) 'page-view.c'; else $(CYGPATH_W) '$(srcdir)/page-view.c'; fi`
-
-simple_scan-simple-scan.o: simple-scan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-simple-scan.o -MD -MP -MF $(DEPDIR)/simple_scan-simple-scan.Tpo -c -o simple_scan-simple-scan.o `test -f 'simple-scan.c' || echo '$(srcdir)/'`simple-scan.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-simple-scan.Tpo $(DEPDIR)/simple_scan-simple-scan.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='simple-scan.c' object='simple_scan-simple-scan.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-simple-scan.o `test -f 'simple-scan.c' || echo '$(srcdir)/'`simple-scan.c
-
-simple_scan-simple-scan.obj: simple-scan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-simple-scan.obj -MD -MP -MF $(DEPDIR)/simple_scan-simple-scan.Tpo -c -o simple_scan-simple-scan.obj `if test -f 'simple-scan.c'; then $(CYGPATH_W) 'simple-scan.c'; else $(CYGPATH_W) '$(srcdir)/simple-scan.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-simple-scan.Tpo $(DEPDIR)/simple_scan-simple-scan.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='simple-scan.c' object='simple_scan-simple-scan.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-simple-scan.obj `if test -f 'simple-scan.c'; then $(CYGPATH_W) 'simple-scan.c'; else $(CYGPATH_W) '$(srcdir)/simple-scan.c'; fi`
-
-simple_scan-scanner.o: scanner.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-scanner.o -MD -MP -MF $(DEPDIR)/simple_scan-scanner.Tpo -c -o simple_scan-scanner.o `test -f 'scanner.c' || echo '$(srcdir)/'`scanner.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-scanner.Tpo $(DEPDIR)/simple_scan-scanner.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scanner.c' object='simple_scan-scanner.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-scanner.o `test -f 'scanner.c' || echo '$(srcdir)/'`scanner.c
-
-simple_scan-scanner.obj: scanner.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-scanner.obj -MD -MP -MF $(DEPDIR)/simple_scan-scanner.Tpo -c -o simple_scan-scanner.obj `if test -f 'scanner.c'; then $(CYGPATH_W) 'scanner.c'; else $(CYGPATH_W) '$(srcdir)/scanner.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-scanner.Tpo $(DEPDIR)/simple_scan-scanner.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scanner.c' object='simple_scan-scanner.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-scanner.obj `if test -f 'scanner.c'; then $(CYGPATH_W) 'scanner.c'; else $(CYGPATH_W) '$(srcdir)/scanner.c'; fi`
-
-simple_scan-ui.o: ui.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-ui.o -MD -MP -MF $(DEPDIR)/simple_scan-ui.Tpo -c -o simple_scan-ui.o `test -f 'ui.c' || echo '$(srcdir)/'`ui.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-ui.Tpo $(DEPDIR)/simple_scan-ui.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ui.c' object='simple_scan-ui.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-ui.o `test -f 'ui.c' || echo '$(srcdir)/'`ui.c
-
-simple_scan-ui.obj: ui.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-ui.obj -MD -MP -MF $(DEPDIR)/simple_scan-ui.Tpo -c -o simple_scan-ui.obj `if test -f 'ui.c'; then $(CYGPATH_W) 'ui.c'; else $(CYGPATH_W) '$(srcdir)/ui.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-ui.Tpo $(DEPDIR)/simple_scan-ui.Po
-@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 \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/simple_scan_vala.stamp; \
-	fi
-$(srcdir)/book-view.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)/page.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)/page-view.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.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)/scanner.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)/ui.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)/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 fixes.vapi packagekit-glib2.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 fixes.vapi packagekit-glib2.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: $(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`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-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
-
-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
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-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 ui.c
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.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
-
-.PRECIOUS: Makefile
-
-
-resources.c: $(top_srcdir)/data/simple-scan.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(top_srcdir)/data/ $(top_srcdir)/data/simple-scan.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data/ --generate-source $<
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/simple-scan.ui b/src/app-window.ui
index 2c6e7ba..bbdf1c7 100644
--- a/data/simple-scan.ui
+++ b/src/app-window.ui
@@ -1,170 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
-  <object class="GtkDialog" id="authorize_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">12</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="type_hint">normal</property>
-    <property name="urgency_hint">True</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="authorize_button">
-                <property name="label" translatable="yes" comments="Button to submit authorization dialog">_Authorize</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="authorize_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" comments="This label is set dynamically and is not translated">To connect to ? you need to authorize</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid" id="grid2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">6</property>
-                <child>
-                  <object class="GtkEntry" id="username_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="invisible_char">●</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="password_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="visibility">False</property>
-                    <property name="invisible_char">●</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="username_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes" comments="Label beside username entry">_Username for resource:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">username_entry</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="password_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes" comments="Label beside password entry">_Password:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">password_entry</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">authorize_button</action-widget>
-    </action-widgets>
-  </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="GtkListStore" id="device_model">
-    <columns>
-      <!-- column-name device_name -->
-      <column type="gchararray"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
+  <requires lib="gtk+" version="3.12"/>
   <object class="GtkImage" id="email_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -175,64 +12,77 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-help</property>
   </object>
-  <object class="GtkListStore" id="page_side_model">
-    <columns>
-      <!-- column-name side -->
-      <column type="gint"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">3</col>
-        <col id="1" translatable="yes" comments="Combo box label for scanning both sides of a page">Front and Back</col>
-      </row>
-      <row>
-        <col id="0">1</col>
-        <col id="1" translatable="yes" comments="Combo box label for scanning the front side of a page">Front</col>
-      </row>
-      <row>
-        <col id="0">2</col>
-        <col id="1" translatable="yes" comments="Combo box label for scanning the back side of a page">Back</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="paper_size_model">
-    <columns>
-      <!-- column-name width -->
-      <column type="gint"/>
-      <!-- column-name height -->
-      <column type="gint"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="photo_dpi_model">
-    <columns>
-      <!-- column-name dpi -->
-      <column type="gint"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkAdjustment" id="quality_adjustment">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+  <object class="GtkMenu" id="scan_button_hb_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="scan_single_button_hb_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="scan_all_button_hb_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="batch_button_hb_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan continuously from the flatbed">_Multiple Pages From Flatbed</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="batch_button_clicked_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="menuitem3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkRadioMenuItem" id="text_button_hb_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Text</property>
+        <property name="use_underline">True</property>
+        <property name="draw_as_radio">True</property>
+        <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkRadioMenuItem" id="photo_button_hb_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Photo</property>
+        <property name="use_underline">True</property>
+        <property name="active">True</property>
+        <property name="draw_as_radio">True</property>
+        <property name="group">text_button_hb_menuitem</property>
+        <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
+      </object>
+    </child>
   </object>
-  <template class="UserInterface" parent="GtkApplicationWindow">
+  <template class="AppWindow" parent="GtkApplicationWindow">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
     <property name="icon_name">scanner</property>
     <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
     <child>
-      <object class="GtkBox" id="main_vbox">
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar">
-            <property name="visible">False</property>
             <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="document_menuitem">
@@ -251,8 +101,8 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="new_button_clicked_cb" swapped="no"/>
+                        <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -272,8 +122,8 @@
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Scan menu item to scan a single page from the scanner">Single _Page</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="1" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                                 <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
+                                <accelerator key="1" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </object>
                             </child>
                             <child>
@@ -282,8 +132,18 @@
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                                 <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
+                                <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkMenuItem" id="batch_menuitem">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" comments="Scan menu item to scan continuously from the flatbed">_Multiple Pages From Flatbed</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="batch_button_clicked_cb" swapped="no"/>
+                                <accelerator key="m" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </object>
                             </child>
                             <child>
@@ -293,8 +153,8 @@
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Menu entry to stop current scan">_Stop Scan</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="Escape" signal="activate"/>
                                 <signal name="activate" handler="stop_scan_button_clicked_cb" swapped="no"/>
+                                <accelerator key="Escape" signal="activate"/>
                               </object>
                             </child>
                             <child>
@@ -346,43 +206,33 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="save_file_button_clicked_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="save_as_menuitem">
-                        <property name="label">gtk-save-as</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="save_as_file_button_clicked_cb" swapped="no"/>
+                        <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="email_menuitem">
                         <property name="label" translatable="yes" comments="Label on email menu item">_Email</property>
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">email_image</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="email_button_clicked_cb" swapped="no"/>
+                        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="print_menuitem">
                         <property name="label">gtk-print</property>
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="print_button_clicked_cb" swapped="no"/>
+                        <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -414,9 +264,9 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
+                        <signal name="activate" handler="quit_menuitem_activate_cb" swapped="no"/>
                         <accelerator key="w" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="quit_menuitem_activate_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -439,8 +289,8 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Menu item to rotate page to left (anti-clockwise)">Rotate _Left</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="bracketleft" signal="activate"/>
                         <signal name="activate" handler="rotate_left_button_clicked_cb" swapped="no"/>
+                        <accelerator key="bracketleft" signal="activate"/>
                       </object>
                     </child>
                     <child>
@@ -449,8 +299,8 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Menu item to rotate page to right (clockwise)">Rotate _Right</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="bracketright" signal="activate"/>
                         <signal name="activate" handler="rotate_right_button_clicked_cb" swapped="no"/>
+                        <accelerator key="bracketright" signal="activate"/>
                       </object>
                     </child>
                     <child>
@@ -576,8 +426,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Menu item to move the selected page to the left">Move Left</property>
-                        <accelerator key="less" signal="activate"/>
                         <signal name="activate" handler="page_move_left_menuitem_activate_cb" swapped="no"/>
+                        <accelerator key="less" signal="activate"/>
                       </object>
                     </child>
                     <child>
@@ -586,8 +436,8 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Menu item to move the selected page to the right">Move Right</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="greater" signal="activate"/>
                         <signal name="activate" handler="page_move_right_menuitem_activate_cb" swapped="no"/>
+                        <accelerator key="greater" signal="activate"/>
                       </object>
                     </child>
                     <child>
@@ -598,8 +448,8 @@
                         <property name="can_focus">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" swapped="no"/>
+                        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -609,8 +459,8 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="Delete" signal="activate"/>
                         <signal name="activate" handler="page_delete_menuitem_activate_cb" swapped="no"/>
+                        <accelerator key="Delete" signal="activate"/>
                       </object>
                     </child>
                   </object>
@@ -635,8 +485,8 @@
                         <property name="use_underline">True</property>
                         <property name="image">help_image</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="F1" signal="activate"/>
                         <signal name="activate" handler="help_contents_menuitem_activate_cb" swapped="no"/>
+                        <accelerator key="F1" signal="activate"/>
                       </object>
                     </child>
                     <child>
@@ -662,26 +512,7 @@
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar">
-            <property name="visible">False</property>
             <property name="can_focus">False</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-            <child>
-              <object class="GtkToolButton" id="new_toolbutton">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" comments="Tooltip for new document button">Start a new document</property>
-                <property name="label" translatable="yes">New</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-new</property>
-                <signal name="clicked" handler="new_button_clicked_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkMenuToolButton" id="scan_toolbutton">
                 <property name="visible">True</property>
@@ -732,570 +563,253 @@
                 <property name="homogeneous">True</property>
               </packing>
             </child>
+            <style>
+              <class name="primary-toolbar"/>
+            </style>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkStack" id="stack">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="rotate_left_toolbutton">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate left (counter-clockwise) button">Rotate the page to the left (counter-clockwise)</property>
-                <property name="label" translatable="yes" comments="Label on rotate page left (anti-clockwise) item">Rotate Left</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">object-rotate-left</property>
-                <signal name="clicked" handler="rotate_left_button_clicked_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="rotate_right_toolbutton">
+              <object class="GtkAlignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate right (clockwise) button">Rotate the page to the right (clockwise)</property>
-                <property name="label" translatable="yes" comments="Label on rotate page right (clockwise) item">Rotate Right</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">object-rotate-right</property>
-                <signal name="clicked" handler="rotate_right_button_clicked_cb" swapped="no"/>
+                <property name="xscale">0</property>
+                <property name="yscale">0</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">10</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="opacity">0.5</property>
+                        <property name="pixel_size">120</property>
+                        <property name="icon_name">scanner-symbolic</property>
+                        <property name="icon_size">6</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="status_primary_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label shown when searching for scanners">Searching for Scanners…</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                          <attribute name="scale" value="1.5"/>
+                        </attributes>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="status_secondary_label">
+                        <property name="visible">False</property>
+                        <property name="can_focus">False</property>
+                        <property name="track_visited_links">False</property>
+                        <signal name="activate_link" handler="status_label_activate_link_cb" swapped="no"/>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="name">startup</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToggleToolButton" id="crop_toolbutton">
+              <object class="GtkBox" id="main_vbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Crop the selected page</property>
-                <property name="is_important">True</property>
-                <property name="label" translatable="yes">Crop</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">object-crop</property>
-                <signal name="toggled" handler="crop_toolbutton_toggled_cb" swapped="no"/>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkActionBar" id="action_bar">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="name">document</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
     </child>
     <child type="titlebar">
-      <object class="GtkHeaderBar" id="headerbar">
+      <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="vexpand">True</property>
         <property name="show_close_button">True</property>
-        <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
-        <style>
-          <class name="titlebar"/>
-        </style>
         <child>
           <object class="GtkBox" id="open_box">
             <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
+            <property name="can_focus">False</property>
             <property name="valign">center</property>
-            <style>
-              <class name="linked"/>
-            </style>
             <child>
               <object class="GtkButton" id="stop_button">
-                <property name="visible">False</property>
-                <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop the current scan</property>
                 <property name="label" translatable="yes">Stop</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop the current scan</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="stop_scan_button_clicked_cb" swapped="no"/>
                 <style>
                   <class name="text-button"/>
+                  <class name="destructive-action"/>
                 </style>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="scan_button">
+                <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button">Scan a single page from the scanner</property>
-                <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
                 <style>
                   <class name="text-button"/>
+                  <class name="suggested-action"/>
                 </style>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
               <object class="GtkMenuButton" id="open_button">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">False</property>
                 <property name="popup">scan_button_hb_menu</property>
+                <child>
+                  <placeholder/>
+                </child>
                 <style>
                   <class name="text-button"/>
                 </style>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="pack_type">start</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="save_button">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
-            <property name="use_underline">True</property>
-            <signal name="clicked" handler="save_file_button_clicked_cb" swapped="no"/>
             <style>
-              <class name="image-button"/>
+              <class name="linked"/>
             </style>
-            <child>
-              <object class="GtkImage" id="save_image">
-                <property name="visible">True</property>
-                <property name="icon_size">1</property>
-                <property name="icon_name">document-save-symbolic</property>
-              </object>
-            </child>
           </object>
-          <packing>
-          </packing>
         </child>
         <child>
-          <object class="GtkButton" id="new_button">
+          <object class="GtkMenuButton" id="menu_button">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" comments="Tooltip for new document button">Start a new document</property>
+            <property name="receives_default">False</property>
             <property name="use_underline">True</property>
-            <signal name="clicked" handler="new_button_clicked_cb" swapped="no"/>
-            <style>
-              <class name="image-button"/>
-            </style>
             <child>
-              <object class="GtkImage" id="new_image">
+              <object class="GtkImage">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">open-menu-symbolic</property>
                 <property name="icon_size">1</property>
-                <property name="icon_name">document-new-symbolic</property>
               </object>
             </child>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="rotate_box">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-            <property name="valign">center</property>
             <style>
-              <class name="linked"/>
+              <class name="image-button"/>
             </style>
-            <child>
-              <object class="GtkButton" id="rotate_right_button">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate right (clockwise) button">Rotate the page to the right (clockwise)</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="rotate_right_button_clicked_cb" swapped="no"/>
-                <style>
-                  <class name="image-button"/>
-                </style>
-                <child>
-                  <object class="GtkImage" id="objectrotateright-button">
-                    <property name="visible">True</property>
-                    <property name="icon_size">1</property>
-                    <property name="icon_name">object-rotate-right-symbolic</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="pack_type">end</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="rotate_left_button">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate left (counter-clockwise) button">Rotate the page to the left (counter-clockwise)</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="rotate_left_button_clicked_cb" swapped="no"/>
-                <style>
-                  <class name="image-button"/>
-                </style>
-                <child>
-                  <object class="GtkImage" id="objectrotateleft-button">
-                    <property name="visible">True</property>
-                    <property name="icon_size">1</property>
-                    <property name="icon_name">object-rotate-left-symbolic</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="pack_type">end</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkToggleButton" id="crop_button">
+          <object class="GtkButton" id="save_button">
             <property name="visible">True</property>
+            <property name="sensitive">False</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Crop the selected page</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
             <property name="use_underline">True</property>
-            <signal name="toggled" handler="crop_button_toggled_cb" swapped="no"/>
-            <style>
-              <class name="image-button"/>
-            </style>
+            <signal name="clicked" handler="save_file_button_clicked_cb" swapped="no"/>
             <child>
-              <object class="GtkImage" id="objectcrop-button">
+              <object class="GtkImage" id="save_image">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">document-save-symbolic</property>
                 <property name="icon_size">1</property>
-                <property name="icon_name">edit-cut-symbolic</property>
               </object>
             </child>
+            <style>
+              <class name="image-button"/>
+            </style>
           </object>
           <packing>
             <property name="pack_type">end</property>
+            <property name="position">3</property>
           </packing>
         </child>
+        <style>
+          <class name="titlebar"/>
+        </style>
       </object>
-      <packing>
-      </packing>
     </child>
   </template>
-  <object class="GtkListStore" id="text_dpi_model">
-    <columns>
-      <!-- column-name dpi -->
-      <column type="gint"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkDialog" id="preferences_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">7</property>
-    <property name="title" translatable="yes" comments="Title of preferences dialog">Preferences</property>
-    <property name="resizable">False</property>
-    <property name="icon_name">scanner</property>
-    <property name="type_hint">normal</property>
-    <signal name="delete-event" handler="preferences_dialog_delete_event_cb" swapped="no"/>
-    <signal name="response" handler="preferences_dialog_response_cb" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="preferences_close_button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="source_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 scan source combo box">Scan S_ource:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">device_combo</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="device_combo">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="model">device_model</property>
-                <signal name="changed" handler="device_combo_changed_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="text_dpi_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 scan source combo box">_Text Resolution:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">text_dpi_combo</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="photo_dpi_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 scan source combo box">_Photo Resolution:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">photo_dpi_combo</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="text_dpi_combo">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="model">text_dpi_model</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="photo_dpi_combo">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="model">photo_dpi_model</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="page_side_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 scan side combo box">Scan Side:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">photo_dpi_combo</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="page_side_combo">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="model">page_side_model</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="paper_size_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 page size combo box">Page Size:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">photo_dpi_combo</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="paper_size_combo">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="model">paper_size_model</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
-                <property name="width">1</property>
-                <property name="height">1</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>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">5</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScale" id="brightness_scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="adjustment">brightness_adjustment</property>
-                <property name="draw_value">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">5</property>
-                <property name="width">1</property>
-                <property name="height">1</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="left_attach">0</property>
-                <property name="top_attach">6</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScale" id="contrast_scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="adjustment">contrast_adjustment</property>
-                <property name="draw_value">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">6</property>
-                <property name="width">1</property>
-                <property name="height">1</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="left_attach">0</property>
-                <property name="top_attach">7</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScale" id="quality_scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="adjustment">quality_adjustment</property>
-                <property name="draw_value">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">7</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="1">preferences_close_button</action-widget>
-    </action-widgets>
-  </object>
   <object class="GtkMenu" id="scan_button_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -1318,63 +832,22 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="menuitem1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkRadioMenuItem" id="text_button_menuitem">
+      <object class="GtkMenuItem" id="batch_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Text</property>
+        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan continuously from the flatbed">_Multiple Pages From Flatbed</property>
         <property name="use_underline">True</property>
-        <property name="draw_as_radio">True</property>
-        <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
+        <signal name="activate" handler="batch_button_clicked_cb" swapped="no"/>
       </object>
     </child>
     <child>
-      <object class="GtkRadioMenuItem" id="photo_button_menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Photo</property>
-        <property name="use_underline">True</property>
-        <property name="active">True</property>
-        <property name="draw_as_radio">True</property>
-        <property name="group">text_button_menuitem</property>
-        <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="scan_button_hb_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="scan_single_button_hb_menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="scan_all_button_hb_menuitem">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="menuitem3">
+      <object class="GtkSeparatorMenuItem" id="menuitem1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkRadioMenuItem" id="text_button_hb_menuitem">
+      <object class="GtkRadioMenuItem" id="text_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">Text</property>
@@ -1384,14 +857,14 @@
       </object>
     </child>
     <child>
-      <object class="GtkRadioMenuItem" id="photo_button_hb_menuitem">
+      <object class="GtkRadioMenuItem" id="photo_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">Photo</property>
         <property name="use_underline">True</property>
         <property name="active">True</property>
         <property name="draw_as_radio">True</property>
-        <property name="group">text_button_hb_menuitem</property>
+        <property name="group">text_button_menuitem</property>
         <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
       </object>
     </child>
diff --git a/src/ui.vala b/src/app-window.vala
index 5e375c4..2cd75ee 100644
--- a/src/ui.vala
+++ b/src/app-window.vala
@@ -10,18 +10,17 @@
  * license.
  */
 
-[GtkTemplate (ui = "/org/gnome/SimpleScan/simple-scan.ui")]
-public class UserInterface : Gtk.ApplicationWindow
-{
-    private const int DEFAULT_TEXT_DPI = 150;
-    private const int DEFAULT_PHOTO_DPI = 300;
+private const int DEFAULT_TEXT_DPI = 150;
+private const int DEFAULT_PHOTO_DPI = 300;
 
+[GtkTemplate (ui = "/org/gnome/SimpleScan/app-window.ui")]
+public class AppWindow : Gtk.ApplicationWindow
+{
     private const GLib.ActionEntry[] action_entries =
     {
         { "new_document", new_document_activate_cb },
         { "reorder", reorder_document_activate_cb },
         { "save", save_document_activate_cb },
-        { "save_as", save_as_document_activate_cb },
         { "email", email_document_activate_cb },
         { "print", print_document_activate_cb },
         { "preferences", preferences_activate_cb },
@@ -32,6 +31,10 @@ public class UserInterface : Gtk.ApplicationWindow
 
     private Settings settings;
 
+    private PreferencesDialog preferences_dialog;
+
+    [GtkChild]
+    private Gtk.HeaderBar header_bar;
     [GtkChild]
     private Gtk.MenuBar menubar;
     [GtkChild]
@@ -39,13 +42,13 @@ public class UserInterface : Gtk.ApplicationWindow
     [GtkChild]
     private Gtk.Menu page_menu;
     [GtkChild]
+    private Gtk.Stack stack;
+    [GtkChild]
+    private Gtk.Label status_primary_label;
+    [GtkChild]
+    private Gtk.Label status_secondary_label;
+    [GtkChild]
     private Gtk.Box main_vbox;
-    private Gtk.InfoBar info_bar;
-    private Gtk.Image info_bar_image;
-    private Gtk.Label info_bar_label;
-    private Gtk.Button info_bar_close_button;
-    private Gtk.Button info_bar_change_scanner_button;
-    private Gtk.Button info_bar_install_button;
     [GtkChild]
     private Gtk.RadioMenuItem custom_crop_menuitem;
     [GtkChild]
@@ -73,7 +76,9 @@ public class UserInterface : Gtk.ApplicationWindow
     [GtkChild]
     private Gtk.MenuItem save_menuitem;
     [GtkChild]
-    private Gtk.MenuItem save_as_menuitem;
+    private Gtk.MenuItem email_menuitem;
+    [GtkChild]
+    private Gtk.MenuItem print_menuitem;
     [GtkChild]
     private Gtk.MenuItem copy_to_clipboard_menuitem;
     [GtkChild]
@@ -85,13 +90,13 @@ public class UserInterface : Gtk.ApplicationWindow
     [GtkChild]
     private Gtk.ToolButton stop_toolbutton;
     [GtkChild]
-    private Gtk.ToggleButton crop_button;
-    [GtkChild]
-    private Gtk.ToggleToolButton crop_toolbutton;
-    [GtkChild]
     private Gtk.Button stop_button;
     [GtkChild]
     private Gtk.Button scan_button;
+    [GtkChild]
+    private Gtk.ActionBar action_bar;
+    private Gtk.ToggleButton crop_button;
+    private Gtk.Button delete_button;
 
     [GtkChild]
     private Gtk.RadioMenuItem text_button_menuitem;
@@ -107,61 +112,14 @@ public class UserInterface : Gtk.ApplicationWindow
     private Gtk.RadioMenuItem photo_menuitem;
 
     [GtkChild]
-    private Gtk.Dialog authorize_dialog;
-    [GtkChild]
-    private Gtk.Label authorize_label;
-    [GtkChild]
-    private Gtk.Entry username_entry;
-    [GtkChild]
-    private Gtk.Entry password_entry;
+    private Gtk.MenuButton menu_button;
 
-    [GtkChild]
-    private Gtk.Dialog preferences_dialog;
-    [GtkChild]
-    private Gtk.ComboBox device_combo;
-    [GtkChild]
-    private Gtk.ComboBox text_dpi_combo;
-    [GtkChild]
-    private Gtk.ComboBox photo_dpi_combo;
-    [GtkChild]
-    private Gtk.ComboBox page_side_combo;
-    [GtkChild]
-    private Gtk.ComboBox paper_size_combo;
-    [GtkChild]
-    private Gtk.Scale brightness_scale;
-    [GtkChild]
-    private Gtk.Scale contrast_scale;
-    [GtkChild]
-    private Gtk.Scale quality_scale;
-    [GtkChild]
-    private Gtk.ListStore device_model;
-    [GtkChild]
-    private Gtk.ListStore text_dpi_model;
-    [GtkChild]
-    private Gtk.ListStore photo_dpi_model;
-    [GtkChild]
-    private Gtk.ListStore page_side_model;
-    [GtkChild]
-    private Gtk.ListStore paper_size_model;
-    [GtkChild]
-    private Gtk.Adjustment brightness_adjustment;
-    [GtkChild]
-    private Gtk.Adjustment contrast_adjustment;
-    [GtkChild]
-    private Gtk.Adjustment quality_adjustment;
-    private bool setting_devices;
     private string? missing_driver = null;
-    private bool user_selected_device;
 
     private Gtk.FileChooserDialog? save_dialog;
-    private ProgressBarDialog progress_dialog;
-
-    private bool have_error;
-    private string error_title;
-    private string error_text;
-    private bool error_change_scanner_hint;
 
     public Book book { get; private set; }
+    private bool book_needs_saving;
     private string? book_uri = null;
 
     public Page selected_page
@@ -180,10 +138,6 @@ public class UserInterface : Gtk.ApplicationWindow
 
     private BookView book_view;
     private bool updating_page_menu;
-    private int default_page_width;
-    private int default_page_height;
-    private int default_page_dpi;
-    private ScanDirection default_page_scan_direction;
 
     private string document_hint = "photo";
 
@@ -194,7 +148,9 @@ public class UserInterface : Gtk.ApplicationWindow
         set
         {
             scanning_ = value;
+            stack.set_visible_child_name ("document");
             page_delete_menuitem.sensitive = !value;
+            delete_button.sensitive = !value;
             stop_scan_menuitem.sensitive = value;
             stop_toolbutton.sensitive = value;
             scan_button.visible = !value;
@@ -205,60 +161,38 @@ public class UserInterface : Gtk.ApplicationWindow
     private int window_width;
     private int window_height;
     private bool window_is_maximized;
-    private bool window_is_fullscreen;    
+    private bool window_is_fullscreen;
 
     private uint save_state_timeout;
 
     public int brightness
     {
-        get { return (int) brightness_adjustment.value; }
-        set { brightness_adjustment.value = value; }
+        get { return preferences_dialog.get_brightness (); }
+        set { preferences_dialog.set_brightness (value); }
     }
 
     public int contrast
     {
-        get { return (int) contrast_adjustment.value; }
-        set { contrast_adjustment.value = value; }
+        get { return preferences_dialog.get_contrast (); }
+        set { preferences_dialog.set_contrast (value); }
     }
 
-    public int quality
+    public int page_delay
     {
-        get { return (int) quality_adjustment.value; }
-        set { quality_adjustment.value = value; }
+        get { return preferences_dialog.get_page_delay (); }
+        set { preferences_dialog.set_page_delay (value); }
     }
 
     public string? selected_device
     {
-        owned get
-        {
-            Gtk.TreeIter iter;
-
-            if (device_combo.get_active_iter (out iter))
-            {
-                string device;
-                device_model.get (iter, 0, out device, -1);
-                return device;
-            }
-
-            return null;
-        }
-
-        set
-        {
-            Gtk.TreeIter iter;
-            if (!find_scan_device (value, out iter))
-                return;
-
-            device_combo.set_active_iter (iter);
-            user_selected_device = true;
-        }
+        owned get { return preferences_dialog.get_selected_device (); }
+        set { preferences_dialog.set_selected_device (value); }
     }
 
     public signal void start_scan (string? device, ScanOptions options);
     public signal void stop_scan ();
-    public signal void email (string profile, int quality);
 
-    public UserInterface ()
+    public AppWindow ()
     {
         settings = new Settings ("org.gnome.SimpleScan");
 
@@ -266,49 +200,34 @@ public class UserInterface : Gtk.ApplicationWindow
         book.page_added.connect (page_added_cb);
         book.reordered.connect (reordered_cb);
         book.page_removed.connect (page_removed_cb);
-        book.needs_saving_changed.connect (needs_saving_cb);
+        book.changed.connect (book_changed_cb);
 
         load ();
 
+        clear_document ();
         autosave_manager = new AutosaveManager ();
         autosave_manager.book = book;
         autosave_manager.load ();
 
         if (book.n_pages == 0)
-        {
-            add_default_page ();
-            book.needs_saving = false;
-        }
+            book_needs_saving = false;
         else
+        {
+            stack.set_visible_child_name ("document");
             book_view.selected_page = book.get_page (0);
+            book_needs_saving = true;
+            book_changed_cb (book);
+        }
     }
 
-    ~UserInterface ()
+    ~AppWindow ()
     {
         book.page_added.disconnect (page_added_cb);
         book.reordered.disconnect (reordered_cb);
         book.page_removed.disconnect (page_removed_cb);
     }
 
-    private bool find_scan_device (string device, out Gtk.TreeIter iter)
-    {
-        bool have_iter = false;
-
-        if (device_model.get_iter_first (out iter))
-        {
-            do
-            {
-                string d;
-                device_model.get (iter, 0, out d, -1);
-                if (d == device)
-                    have_iter = true;
-            } while (!have_iter && device_model.iter_next (ref iter));
-        }
-
-        return have_iter;
-    }
-
-    private void show_error_dialog (string error_title, string error_text)
+    public void show_error_dialog (string error_title, string error_text)
     {
         var dialog = new Gtk.MessageDialog (this,
                                             Gtk.DialogFlags.MODAL,
@@ -323,174 +242,47 @@ public class UserInterface : Gtk.ApplicationWindow
 
     public void authorize (string resource, out string username, out string password)
     {
-        /* Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization */
-        var description = _("Username and password required to access '%s'").printf (resource);
-
-        username_entry.text = "";
-        password_entry.text = "";
-        authorize_label.set_text (description);
-
+        /* Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization */
+        var description = _("Username and password required to access “%s”").printf (resource);
+        var authorize_dialog = new AuthorizeDialog (description);
         authorize_dialog.visible = true;
+        authorize_dialog.transient_for = this;
         authorize_dialog.run ();
-        authorize_dialog.visible = false;
+        authorize_dialog.destroy ();
 
-        username = username_entry.text;
-        password = password_entry.text;
+        username = authorize_dialog.get_username ();
+        password = authorize_dialog.get_password ();
     }
 
-    [GtkCallback]
-    private void device_combo_changed_cb (Gtk.Widget widget)
+    public void set_scan_devices (List<ScanDevice> devices, string? missing_driver = null)
     {
-        if (setting_devices)
-            return;
-        user_selected_device = true;
-        if (selected_device != null)
-            settings.set_string ("selected-device", selected_device);
-    }
+        this.missing_driver = missing_driver;
 
-    private void update_info_bar ()
-    {
-        Gtk.MessageType type;
-        string title, text, image_id;
-        bool show_close_button = false;
-        bool show_install_button = false;
-        bool show_change_scanner_button = false;
+        preferences_dialog.set_scan_devices (devices);
 
-        if (have_error)
+        if (devices != null)
         {
-            type = Gtk.MessageType.ERROR;
-            image_id = "dialog-error";
-            title = error_title;
-            text = error_text;
-            show_close_button = true;
-            show_change_scanner_button = error_change_scanner_hint;
+            status_primary_label.set_text (/* Label shown when detected a scanner */
+                                           _("Ready to Scan"));
+            status_secondary_label.set_text (preferences_dialog.get_selected_device_label ());
+            status_secondary_label.visible = true;
         }
-        else if (device_model.iter_n_children (null) == 0)
+        else if (missing_driver != null)
         {
-            type = Gtk.MessageType.WARNING;
-            image_id = "dialog-warning";
-            if (missing_driver == null)
-            {
-                /* Warning displayed when no scanners are detected */
-                title = _("No scanners detected");
-                /* Hint to user on why there are no scanners detected */
-                text = _("Please check your scanner is connected and powered on");
-            }
-            else
-            {
-                /* Warning displayed when no drivers are installed but a compatible scanner is detected */
-                title = _("Additional software needed");
-                /* Instructions to install driver software */
-                text = _("You need to install driver software for your scanner.");
-                show_install_button = true;
-            }
+            status_primary_label.set_text (/* Warning displayed when no drivers are installed but a compatible scanner is detected */
+                                           _("Additional software needed"));
+            /* Instructions to install driver software */
+            status_secondary_label.set_markup (_("You need to <a href=\"install-firmware\">install driver software</a> for your scanner."));
+            status_secondary_label.visible = true;
         }
         else
         {
-            info_bar.visible = false;
-            return;
+            /* Warning displayed when no scanners are detected */
+            status_primary_label.set_text (_("No scanners detected"));
+            /* Hint to user on why there are no scanners detected */
+            status_secondary_label.set_text (_("Please check your scanner is connected and powered on"));
+            status_secondary_label.visible = true;
         }
-
-        info_bar.message_type = type;
-        info_bar_image.set_from_icon_name (image_id, Gtk.IconSize.DIALOG);
-        var message = "<big><b>%s</b></big>\n\n%s".printf (title, text);
-        info_bar_label.set_markup (message);
-        info_bar_close_button.visible = show_close_button;
-        info_bar_change_scanner_button.visible = show_change_scanner_button;
-        info_bar_install_button.visible = show_install_button;
-        info_bar.visible = true;
-    }
-
-    public void set_scan_devices (List<ScanDevice> devices, string? missing_driver = null)
-    {
-        bool have_selection = false;
-        int index;
-        Gtk.TreeIter iter;
-
-        setting_devices = true;
-
-        this.missing_driver = missing_driver;
-
-        /* If the user hasn't chosen a scanner choose the best available one */
-        if (user_selected_device)
-            have_selection = device_combo.active >= 0;
-
-        /* Add new devices */
-        index = 0;
-        foreach (var device in devices)
-        {
-            int n_delete = -1;
-
-            /* Find if already exists */
-            if (device_model.iter_nth_child (out iter, null, index))
-            {
-                int i = 0;
-                do
-                {
-                    string name;
-                    bool matched;
-
-                    device_model.get (iter, 0, out name, -1);
-                    matched = name == device.name;
-
-                    if (matched)
-                    {
-                        n_delete = i;
-                        break;
-                    }
-                    i++;
-                } while (device_model.iter_next (ref iter));
-            }
-
-            /* If exists, remove elements up to this one */
-            if (n_delete >= 0)
-            {
-                int i;
-
-                /* Update label */
-                device_model.set (iter, 1, device.label, -1);
-
-                for (i = 0; i < n_delete; i++)
-                {
-                    device_model.iter_nth_child (out iter, null, index);
-                    device_model.remove (iter);
-                }
-            }
-            else
-            {
-                device_model.insert (out iter, index);
-                device_model.set (iter, 0, device.name, 1, device.label, -1);
-            }
-            index++;
-        }
-
-        /* Remove any remaining devices */
-        while (device_model.iter_nth_child (out iter, null, index))
-            device_model.remove (iter);
-
-        /* Select the previously selected device or the first available device */
-        if (!have_selection)
-        {
-            var device = settings.get_string ("selected-device");
-            if (device != null && find_scan_device (device, out iter))
-                device_combo.set_active_iter (iter);
-            else
-                device_combo.set_active (0);
-        }
-
-        setting_devices = false;
-
-        update_info_bar ();
-    }
-
-    private void add_default_page ()
-    {
-        var page = new Page (default_page_width,
-                             default_page_height,
-                             default_page_dpi,
-                             default_page_scan_direction);
-        book.append_page (page);
-        book_view.selected_page = page;
     }
 
     private string choose_file_location ()
@@ -503,23 +295,30 @@ public class UserInterface : Gtk.ApplicationWindow
             directory = Environment.get_user_special_dir (UserDirectory.DOCUMENTS);
 
         save_dialog = new Gtk.FileChooserDialog (/* Save dialog: Dialog title */
-                                                 _("Save As..."),
+                                                 _("Save As…"),
                                                  this,
                                                  Gtk.FileChooserAction.SAVE,
                                                  _("_Cancel"), Gtk.ResponseType.CANCEL,
                                                  _("_Save"), Gtk.ResponseType.ACCEPT,
                                                  null);
-        save_dialog.do_overwrite_confirmation = true;
         save_dialog.local_only = false;
-        save_dialog.set_current_folder (directory);
-        /* Default filename to use when saving document */
-        save_dialog.set_current_name (_("Scanned Document.pdf"));
+        if (book_uri != null)
+            save_dialog.set_uri (book_uri);
+        else {
+            save_dialog.set_current_folder (directory);
+            /* Default filename to use when saving document */
+            save_dialog.set_current_name (_("Scanned Document.pdf"));
+        }
 
         /* Filter to only show images by default */
         var filter = new Gtk.FileFilter ();
-        filter.set_filter_name (/* Save dialog: Filter name to show only image files */
+        filter.set_filter_name (/* Save dialog: Filter name to show only supported image files */
                                 _("Image Files"));
-        filter.add_pixbuf_formats ();
+        filter.add_mime_type ("image/jpeg");
+        filter.add_mime_type ("image/png");
+#if HAVE_WEBP
+        filter.add_mime_type ("image/webp");
+#endif
         filter.add_mime_type ("application/pdf");
         save_dialog.add_filter (filter);
         filter = new Gtk.FileFilter ();
@@ -548,12 +347,20 @@ public class UserInterface : Gtk.ApplicationWindow
                              0, _("PNG (lossless)"),
                              1, ".png",
                              -1);
+#if HAVE_WEBP
+        file_type_store.append (out iter);
+        file_type_store.set (iter,
+                             /* Save dialog: Label for sabing in WEBP format */
+                             0, _("WebP (compressed)"),
+                             1, ".webp",
+                             -1);
+#endif
 
         var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
         box.visible = true;
         save_dialog.set_extra_widget (box);
 
-        /* Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG) */
+        /* Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP) */
         var label = new Gtk.Label (_("File format:"));
         label.visible = true;
         box.pack_start (label, false, false, 0);
@@ -563,6 +370,23 @@ public class UserInterface : Gtk.ApplicationWindow
         var renderer = new Gtk.CellRendererText ();
         file_type_combo.pack_start (renderer, true);
         file_type_combo.add_attribute (renderer, "text", 0);
+        box.pack_start (file_type_combo, false, true, 0);
+
+        /* Label in save dialog beside compression slider */
+        var quality_label = new Gtk.Label (_("Compression:"));
+        box.pack_start (quality_label, false, false, 0);
+
+        var quality_adjustment = new Gtk.Adjustment (75, 0, 100, 1, 10, 0);
+        var quality_scale = new Gtk.Scale (Gtk.Orientation.HORIZONTAL, quality_adjustment);
+        quality_scale.width_request = 200;
+        quality_scale.draw_value = false;
+        quality_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
+        quality_scale.add_mark (75, Gtk.PositionType.BOTTOM, null);
+        quality_scale.add_mark (90, Gtk.PositionType.BOTTOM, null);
+        quality_scale.add_mark (100, Gtk.PositionType.BOTTOM, null);
+        quality_adjustment.value = settings.get_int ("jpeg-quality");
+        quality_adjustment.value_changed.connect (() => { settings.set_int ("jpeg-quality", (int) quality_adjustment.value); });
+        box.pack_start (quality_scale, false, false, 0);
 
         file_type_combo.set_active (0);
         file_type_combo.changed.connect (() =>
@@ -581,14 +405,18 @@ public class UserInterface : Gtk.ApplicationWindow
                 filename = filename.slice (0, extension_index);
             filename = filename + extension;
             save_dialog.set_current_name (filename);
-        });
-        box.pack_start (file_type_combo, false, false, 0);
 
-        var response = save_dialog.run ();
+            /* Quality not applicable to PNG */
+            quality_scale.visible = quality_label.visible = (extension != ".png");
+        });
 
         string? uri = null;
-        if (response == Gtk.ResponseType.ACCEPT)
+        while (true)
         {
+            var response = save_dialog.run ();
+            if (response != Gtk.ResponseType.ACCEPT)
+                break;
+
             var extension = "";
             Gtk.TreeIter i;
             if (file_type_combo.get_active_iter (out i))
@@ -602,6 +430,24 @@ public class UserInterface : Gtk.ApplicationWindow
                 path += extension;
 
             uri = File.new_for_path (path).get_uri ();
+
+            /* Check the file(s) don't already exist */
+            var files = new List<File> ();
+            var format = uri_to_format (uri);
+#if HAVE_WEBP
+            if (format == "jpeg" || format == "png" || format == "webp")
+#else
+            if (format == "jpeg" || format == "png")
+#endif
+            {
+                for (var j = 0; j < book.n_pages; j++)
+                    files.append (make_indexed_file (uri, j, book.n_pages));
+            }
+            else
+                files.append (File.new_for_uri (uri));
+
+            if (check_overwrite (save_dialog, files))
+                break;
         }
 
         settings.set_string ("save-directory", save_dialog.get_current_folder ());
@@ -612,13 +458,47 @@ public class UserInterface : Gtk.ApplicationWindow
         return uri;
     }
 
-    private bool save_document (bool force_choose_location)
+    private bool check_overwrite (Gtk.Window parent, List<File> files)
+    {
+        foreach (var file in files)
+        {
+            if (!file.query_exists ())
+                continue;
+
+            var dialog = new Gtk.MessageDialog (parent, Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT, Gtk.MessageType.QUESTION, Gtk.ButtonsType.NONE,
+                                                /* Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file. */
+                                                _("A file named “%s” already exists.  Do you want to replace it?"), file.get_basename ());
+            dialog.add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
+            dialog.add_button (/* Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file. */
+                               _("_Replace"), Gtk.ResponseType.ACCEPT);
+            var response = dialog.run ();
+            dialog.destroy ();
+
+            if (response != Gtk.ResponseType.ACCEPT)
+                return false;
+        }
+
+        return true;
+    }
+
+    private string uri_to_format (string uri)
     {
-        string? uri;
-        if (book_uri != null && !force_choose_location)
-            uri = book_uri;
+        var uri_lower = uri.down ();
+        if (uri_lower.has_suffix (".pdf"))
+            return "pdf";
+        else if (uri_lower.has_suffix (".png"))
+            return "png";
+#if HAVE_WEBP
+        else if (uri_lower.has_suffix (".webp"))
+            return "webp";
+#endif
         else
-            uri = choose_file_location ();
+            return "jpeg";
+    }
+
+    private async bool save_document_async ()
+    {
+        var uri = choose_file_location ();
         if (uri == null)
             return false;
 
@@ -626,41 +506,38 @@ public class UserInterface : Gtk.ApplicationWindow
 
         debug ("Saving to '%s'", uri);
 
-        var uri_lower = uri.down ();
-        string format = "jpeg";
-        if (uri_lower.has_suffix (".pdf"))
-            format = "pdf";
-        else if (uri_lower.has_suffix (".ps"))
-            format = "ps";
-        else if (uri_lower.has_suffix (".png"))
-            format = "png";
-        else if (uri_lower.has_suffix (".tif") || uri_lower.has_suffix (".tiff"))
-            format = "tiff";
+        var format = uri_to_format (uri);
 
-        show_progress_dialog ();
+        var cancellable = new Cancellable ();
+        var progress_bar =  new CancellableProgressBar (_("Saving"), cancellable);
+        action_bar.pack_end (progress_bar);
+        progress_bar.visible = true;
         try
         {
-            book.save (format, quality, file);
+            yield book.save_async (format, settings.get_int ("jpeg-quality"), file, (fraction) =>
+            {
+                progress_bar.set_fraction (fraction);
+            }, cancellable);
         }
         catch (Error e)
         {
-            hide_progress_dialog ();
+            progress_bar.destroy ();
             warning ("Error saving file: %s", e.message);
-            show_error (/* Title of error dialog when save failed */
-                        _("Failed to save file"),
-                        e.message,
-                        false);
+            show_error_dialog (/* Title of error dialog when save failed */
+                              _("Failed to save file"),
+                               e.message);
             return false;
         }
+        progress_bar.destroy_with_delay (500);
 
+        book_needs_saving = false;
         book_uri = uri;
-        book.needs_saving = false;
         return true;
     }
 
-    private bool prompt_to_save (string title, string discard_label)
+    private async bool prompt_to_save_async (string title, string discard_label)
     {
-        if (!book.needs_saving)
+        if (!book_needs_saving)
             return true;
 
         var dialog = new Gtk.MessageDialog (this,
@@ -670,7 +547,7 @@ public class UserInterface : Gtk.ApplicationWindow
                                             "%s", title);
         dialog.format_secondary_text ("%s",
                                       /* Text in dialog warning when a document is about to be lost*/
-                                      _("If you don't save, changes will be permanently lost."));
+                                      _("If you don’t save, changes will be permanently lost."));
         dialog.add_button (discard_label, Gtk.ResponseType.NO);
         dialog.add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
         dialog.add_button (_("_Save"), Gtk.ResponseType.YES);
@@ -681,7 +558,7 @@ public class UserInterface : Gtk.ApplicationWindow
         switch (response)
         {
         case Gtk.ResponseType.YES:
-            if (save_document (false))
+            if (yield save_document_async ())
                 return true;
             else
                 return false;
@@ -695,24 +572,46 @@ public class UserInterface : Gtk.ApplicationWindow
     private void clear_document ()
     {
         book.clear ();
-        add_default_page ();
+        book_needs_saving = false;
         book_uri = null;
-        book.needs_saving = false;
-        save_as_menuitem.sensitive = false;
+        save_menuitem.sensitive = false;
+        email_menuitem.sensitive = false;
+        print_menuitem.sensitive = false;
+        save_button.sensitive = false;
+        save_toolbutton.sensitive = false;
         copy_to_clipboard_menuitem.sensitive = false;
+        status_primary_label.set_text (/* Label shown when detected a scanner */
+                                       _("Ready to Scan"));
+        stack.set_visible_child_name ("startup");
     }
 
     private void new_document ()
     {
-        if (!prompt_to_save (/* Text in dialog warning when a document is about to be lost */
-                             _("Save current document?"),
-                             /* Button in dialog to create new document and discard unsaved document */
-                             _("Discard Changes")))
-            return;
+        prompt_to_save_async.begin (/* Text in dialog warning when a document is about to be lost */
+                                    _("Save current document?"),
+                                    /* Button in dialog to create new document and discard unsaved document */
+                                    _("Discard Changes"), (obj, res) =>
+        {
+            if (!prompt_to_save_async.end(res))
+                return;
 
-        if (scanning)
-            stop_scan ();
-        clear_document ();
+            if (scanning)
+                stop_scan ();
+
+            clear_document ();
+        });
+    }
+
+    [GtkCallback]
+    private bool status_label_activate_link_cb (Gtk.Label label, string uri)
+    {
+        if (uri == "install-firmware")
+        {
+            install_drivers ();
+            return true;
+        }
+
+        return false;
     }
 
     [GtkCallback]
@@ -761,111 +660,25 @@ public class UserInterface : Gtk.ApplicationWindow
             set_document_hint ("photo", true);
     }
 
-    private void set_page_side (ScanType page_side)
-    {
-        Gtk.TreeIter iter;
-
-        if (page_side_model.get_iter_first (out iter))
-        {
-            do
-            {
-                int s;
-                page_side_model.get (iter, 0, out s, -1);
-                if (s == page_side)
-                {
-                    page_side_combo.set_active_iter (iter);
-                    return;
-                }
-            } while (page_side_model.iter_next (ref iter));
-         }
-    }
-
-    private void set_paper_size (int width, int height)
-    {
-        Gtk.TreeIter iter;
-        bool have_iter;
-
-        for (have_iter = paper_size_model.get_iter_first (out iter);
-             have_iter;
-             have_iter = paper_size_model.iter_next (ref iter))
-        {
-            int w, h;
-            paper_size_model.get (iter, 0, out w, 1, out h, -1);
-            if (w == width && h == height)
-               break;
-        }
-
-        if (!have_iter)
-            have_iter = paper_size_model.get_iter_first (out iter);
-        if (have_iter)
-            paper_size_combo.set_active_iter (iter);
-    }
-
-    private int get_text_dpi ()
-    {
-        Gtk.TreeIter iter;
-        int dpi = DEFAULT_TEXT_DPI;
-
-        if (text_dpi_combo.get_active_iter (out iter))
-            text_dpi_model.get (iter, 0, out dpi, -1);
-
-        return dpi;
-    }
-
-    private int get_photo_dpi ()
-    {
-        Gtk.TreeIter iter;
-        int dpi = DEFAULT_PHOTO_DPI;
-
-        if (photo_dpi_combo.get_active_iter (out iter))
-            photo_dpi_model.get (iter, 0, out dpi, -1);
-
-        return dpi;
-    }
-
-    private ScanType get_page_side ()
-    {
-        Gtk.TreeIter iter;
-        int page_side = ScanType.ADF_BOTH;
-
-        if (page_side_combo.get_active_iter (out iter))
-            page_side_model.get (iter, 0, out page_side, -1);
-
-        return (ScanType) page_side;
-    }
-
-    private bool get_paper_size (out int width, out int height)
-    {
-        Gtk.TreeIter iter;
-
-        width = height = 0;
-        if (paper_size_combo.get_active_iter (out iter))
-        {
-            paper_size_model.get (iter, 0, ref width, 1, ref height, -1);
-            return true;
-        }
-
-        return false;
-    }
-
     private ScanOptions make_scan_options ()
     {
         var options = new ScanOptions ();
         if (document_hint == "text")
         {
             options.scan_mode = ScanMode.GRAY;
-            options.dpi = get_text_dpi ();
+            options.dpi = preferences_dialog.get_text_dpi ();
             options.depth = 2;
         }
         else
         {
             options.scan_mode = ScanMode.COLOR;
-            options.dpi = get_photo_dpi ();
+            options.dpi = preferences_dialog.get_photo_dpi ();
             options.depth = 8;
         }
-        get_paper_size (out options.paper_width, out options.paper_height);
+        preferences_dialog.get_paper_size (out options.paper_width, out options.paper_height);
         options.brightness = brightness;
         options.contrast = contrast;
+        options.page_delay = page_delay;
 
         return options;
     }
@@ -875,6 +688,8 @@ public class UserInterface : Gtk.ApplicationWindow
     {
         var options = make_scan_options ();
         options.type = ScanType.SINGLE;
+        status_primary_label.set_text (/* Label shown when scan started */
+                                       _("Contacting scanner…"));
         start_scan (selected_device, options);
     }
 
@@ -892,32 +707,28 @@ public class UserInterface : Gtk.ApplicationWindow
         else
         {
             var options = make_scan_options ();
-            options.type = get_page_side ();
+            options.type = preferences_dialog.get_page_side ();
             start_scan (selected_device, options);
         }
     }
 
     [GtkCallback]
-    private void preferences_button_clicked_cb (Gtk.Widget widget)
+    private void batch_button_clicked_cb (Gtk.Widget widget)
     {
-        preferences_dialog.present ();
-    }
-
-    public void preferences_activate_cb ()
-    {
-        preferences_dialog.present ();
+        var options = make_scan_options ();
+        options.type = ScanType.BATCH;
+        start_scan (selected_device, options);
     }
 
     [GtkCallback]
-    private bool preferences_dialog_delete_event_cb (Gtk.Widget widget, Gdk.EventAny event)
+    private void preferences_button_clicked_cb (Gtk.Widget widget)
     {
-        return true;
+        preferences_dialog.present ();
     }
 
-    [GtkCallback]
-    private void preferences_dialog_response_cb (Gtk.Widget widget, int response_id)
+    public void preferences_activate_cb ()
     {
-        preferences_dialog.visible = false;
+        preferences_dialog.present ();
     }
 
     private void update_page_menu ()
@@ -970,21 +781,18 @@ public class UserInterface : Gtk.ApplicationWindow
 
         menuitem.active = true;
         crop_button.active = page.has_crop;
-        crop_toolbutton.active = page.has_crop;
 
         updating_page_menu = false;
     }
 
     private void show_page_cb (BookView view, Page page)
     {
-        var path = get_temporary_filename ("scanned-page", "tiff");
-        if (path == null)
-            return;
-        var file = File.new_for_path (path);
-
+        File file;
         try
         {
-            page.save ("tiff", quality, file);
+            var dir = DirUtils.make_tmp ("simple-scan-XXXXXX");
+            file = File.new_for_path (Path.build_filename (dir, "scan.png"));
+            page.save_png (file);
         }
         catch (Error e)
         {
@@ -1075,30 +883,6 @@ public class UserInterface : Gtk.ApplicationWindow
     }
 
     [GtkCallback]
-    private void crop_button_toggled_cb (Gtk.ToggleButton widget)
-    {
-        if (updating_page_menu)
-            return;
-
-        if (widget.active)
-            custom_crop_menuitem.active = true;
-        else
-            no_crop_menuitem.active = true;
-    }
-
-    [GtkCallback]
-    private void crop_toolbutton_toggled_cb (Gtk.ToggleToolButton widget)
-    {
-        if (updating_page_menu)
-            return;
-
-        if (widget.active)
-            custom_crop_menuitem.active = true;
-        else
-            no_crop_menuitem.active = true;
-    }
-
-    [GtkCallback]
     private void four_by_six_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
         if (widget.active)
@@ -1347,12 +1131,12 @@ public class UserInterface : Gtk.ApplicationWindow
     [GtkCallback]
     private void save_file_button_clicked_cb (Gtk.Widget widget)
     {
-        save_document (false);
+        save_document_async.begin ();
     }
 
     public void save_document_activate_cb ()
     {
-        save_document (false);
+        save_document_async.begin ();
     }
 
     [GtkCallback]
@@ -1363,17 +1147,6 @@ public class UserInterface : Gtk.ApplicationWindow
             page.copy_to_clipboard (this);
     }
 
-    [GtkCallback]
-    private void save_as_file_button_clicked_cb (Gtk.Widget widget)
-    {
-        save_document (true);
-    }
-
-    public void save_as_document_activate_cb ()
-    {
-        save_document (true);
-    }
-
     private void draw_page (Gtk.PrintOperation operation,
                             Gtk.PrintContext   print_context,
                             int                page_number)
@@ -1402,12 +1175,38 @@ public class UserInterface : Gtk.ApplicationWindow
     [GtkCallback]
     private void email_button_clicked_cb (Gtk.Widget widget)
     {
-        email (document_hint, quality);
+        email_document_async.begin ();
     }
 
     public void email_document_activate_cb ()
     {
-        email (document_hint, quality);
+        email_document_async.begin ();
+    }
+
+    private async void email_document_async ()
+    {
+        try
+        {
+            var dir = DirUtils.make_tmp ("simple-scan-XXXXXX");
+            var type = document_hint == "text" ? "pdf" : "jpeg";
+            var file = File.new_for_path (Path.build_filename (dir, "scan." + type));
+            yield book.save_async (type, settings.get_int ("jpeg-quality"), file, null, null);
+            var command_line = "xdg-email";
+            if (type == "pdf")
+                command_line += "--attach %s".printf (file.get_path ());
+            else
+            {
+                for (var i = 0; i < book.n_pages; i++) {
+                    var indexed_file = make_indexed_file (file.get_uri (), i, book.n_pages);
+                    command_line += " --attach %s".printf (indexed_file.get_path ());
+                }
+            }
+            Process.spawn_command_line_async (command_line);
+        }
+        catch (Error e)
+        {
+            warning ("Unable to email document: %s", e.message);
+        }
     }
 
     private void print_document ()
@@ -1503,22 +1302,23 @@ public class UserInterface : Gtk.ApplicationWindow
         show_about ();
     }
 
-    private bool on_quit ()
+    private void on_quit ()
     {
-        if (!prompt_to_save (/* Text in dialog warning when a document is about to be lost */
-                             _("Save document before quitting?"),
-                             /* Button in dialog to quit and discard unsaved document */
-                             _("Quit without Saving")))
-            return false;
-
-        destroy ();
+        prompt_to_save_async.begin (/* Text in dialog warning when a document is about to be lost */
+                                    _("Save document before quitting?"),
+                                    /* Text in dialog warning when a document is about to be lost */
+                                    _("Quit without Saving"), (obj, res) =>
+        {
+            if (!prompt_to_save_async.end(res))
+                return;
 
-        if (save_state_timeout != 0)
-            save_state (true);
+            destroy ();
 
-        autosave_manager.cleanup ();
+            if (save_state_timeout != 0)
+                save_state (true);
 
-        return true;
+            autosave_manager.cleanup ();
+        });
     }
 
     [GtkCallback]
@@ -1543,28 +1343,6 @@ public class UserInterface : Gtk.ApplicationWindow
         }
     }
 
-    private void info_bar_response_cb (Gtk.InfoBar widget, int response_id)
-    {
-        switch (response_id)
-        {
-        /* Change scanner */
-        case 1:
-            device_combo.grab_focus ();
-            preferences_dialog.present ();
-            break;
-        /* Install drivers */
-        case 2:
-            install_drivers ();
-            break;
-        default:
-            have_error = false;
-            error_title = null;
-            error_text = null;
-            update_info_bar ();
-            break;
-        }
-    }
-
     private void install_drivers ()
     {
         var message = "", instructions = "";
@@ -1611,7 +1389,7 @@ public class UserInterface : Gtk.ApplicationWindow
         var instructions_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
         instructions_box.visible = true;
         dialog.get_content_area ().pack_start (instructions_box, true, true, 0);
-        
+
         var stack = new Gtk.Stack ();
         instructions_box.pack_start (stack, false, false, 0);
 
@@ -1625,14 +1403,14 @@ public class UserInterface : Gtk.ApplicationWindow
 
         var instructions_label = new Gtk.Label (instructions);
         instructions_label.visible = true;
-        instructions_label.xalign = 0f;        
+        instructions_label.xalign = 0f;
         instructions_label.use_markup = true;
         instructions_box.pack_start (instructions_label, false, false, 0);
 
         label = new Gtk.Label (/* Message in driver install dialog */
                                _("Once installed you will need to restart Simple Scan."));
         label.visible = true;
-        label.xalign = 0f;        
+        label.xalign = 0f;
         dialog.get_content_area ().border_width = 12;
         dialog.get_content_area ().pack_start (label, true, true, 0);
 
@@ -1642,7 +1420,7 @@ public class UserInterface : Gtk.ApplicationWindow
             stack.visible = true;
             spinner.active = true;
             instructions_label.set_text (/* Label shown while installing drivers */
-                                         _("Installing drivers..."));
+                                         _("Installing drivers…"));
             install_packages.begin (packages_to_install, () => {}, (object, result) =>
             {
                 status_label.visible = true;
@@ -1673,7 +1451,7 @@ public class UserInterface : Gtk.ApplicationWindow
             });
 #else
             instructions_label.set_text (/* Label shown to prompt user to install packages (when PackageKit not available) */
-                                         _("You need to install the %s package(s).").printf (string.joinv (", ", packages_to_install)));
+                                         ngettext ("You need to install the %s package.", "You need to install the %s packages.", packages_to_install.length).printf (string.joinv (", ", packages_to_install)));
 #endif
         }
 
@@ -1724,30 +1502,12 @@ public class UserInterface : Gtk.ApplicationWindow
     [GtkCallback]
     private bool window_delete_event_cb (Gtk.Widget widget, Gdk.EventAny event)
     {
-        return !on_quit ();
-    }
-
-    private void page_size_changed_cb (Page page)
-    {
-        default_page_width = page.width;
-        default_page_height = page.height;
-        default_page_dpi = page.dpi;
-        save_state ();
-    }
-
-    private void page_scan_direction_changed_cb (Page page)
-    {
-        default_page_scan_direction = page.scan_direction;
-        save_state ();
+        on_quit ();
+        return true; /* Let us quit on our own terms */
     }
 
     private void page_added_cb (Book book, Page page)
     {
-        page_size_changed_cb (page);
-        default_page_scan_direction = page.scan_direction;
-        page.size_changed.connect (page_size_changed_cb);
-        page.scan_direction_changed.connect (page_scan_direction_changed_cb);
-
         update_page_menu ();
     }
 
@@ -1758,68 +1518,35 @@ public class UserInterface : Gtk.ApplicationWindow
 
     private void page_removed_cb (Book book, Page page)
     {
-        page.size_changed.disconnect (page_size_changed_cb);
-        page.scan_direction_changed.disconnect (page_scan_direction_changed_cb);
-
-        /* If this is the last page add a new blank one */
-        if (book.n_pages == 0)
-            add_default_page ();
-
         update_page_menu ();
     }
 
-    private void set_dpi_combo (Gtk.ComboBox combo, int default_dpi, int current_dpi)
-    {
-        var renderer = new Gtk.CellRendererText ();
-        combo.pack_start (renderer, true);
-        combo.add_attribute (renderer, "text", 1);
-
-        var model = combo.model as Gtk.ListStore;
-        int[] scan_resolutions = {75, 150, 300, 600, 1200, 2400};
-        foreach (var dpi in scan_resolutions)
-        {
-            string label;
-            if (dpi == default_dpi)
-                /* Preferences dialog: Label for default resolution in resolution list */
-                label = _("%d dpi (default)").printf (dpi);
-            else if (dpi == 75)
-                /* Preferences dialog: Label for minimum resolution in resolution list */
-                label = _("%d dpi (draft)").printf (dpi);
-            else if (dpi == 1200)
-                /* Preferences dialog: Label for maximum resolution in resolution list */
-                label = _("%d dpi (high resolution)").printf (dpi);
-            else
-                /* Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch) */
-                label = _("%d dpi").printf (dpi);
-
-            Gtk.TreeIter iter;
-            model.append (out iter);
-            model.set (iter, 0, dpi, 1, label, -1);
-
-            if (dpi == current_dpi)
-                combo.set_active_iter (iter);
-        }
-    }
-
-    private void needs_saving_cb (Book book)
+    private void book_changed_cb (Book book)
     {
-        save_menuitem.sensitive = book.needs_saving;
-        save_button.sensitive = book.needs_saving;
-        save_toolbutton.sensitive = book.needs_saving;
-        if (book.needs_saving)
-            save_as_menuitem.sensitive = true;
+        save_menuitem.sensitive = true;
+        email_menuitem.sensitive = true;
+        print_menuitem.sensitive = true;
+        save_button.sensitive = true;
+        save_toolbutton.sensitive = true;
+        book_needs_saving = true;
         copy_to_clipboard_menuitem.sensitive = true;
     }
 
     private void load ()
     {
+        var use_header_bar = !is_traditional_desktop ();
+
+        preferences_dialog = new PreferencesDialog (settings, use_header_bar);
+        preferences_dialog.delete_event.connect (() => { return true; });
+        preferences_dialog.response.connect (() => { preferences_dialog.visible = false; });
+
         Gtk.IconTheme.get_default ().append_search_path (ICON_DIR);
 
         Gtk.Window.set_default_icon_name ("scanner");
 
         var app = Application.get_default () as Gtk.Application;
 
-        if (is_traditional_desktop ())
+        if (!use_header_bar)
         {
             set_titlebar (null);
             menubar.visible = true;
@@ -1827,29 +1554,22 @@ public class UserInterface : Gtk.ApplicationWindow
         }
         else
         {
+            /* Set HeaderBar title here because Glade doesn't keep it translated */
+            /* https://bugzilla.gnome.org/show_bug.cgi?id=782753 */
+            /* Title of scan window */
+            header_bar.title = _("Simple Scan");
+
             app.add_action_entries (action_entries, this);
 
             var appmenu = new Menu ();
-            var section = new Menu ();
-            appmenu.append_section (null, section);
-            section.append (_("New Document"), "app.new_document");
-
-            section = new Menu ();
-            appmenu.append_section (null, section);
-            var menu = new Menu ();
-            section.append_submenu (_("Document"), menu);
-            menu.append (_("Reorder Pages"), "app.reorder");
-            menu.append (_("Save"), "app.save");
-            menu.append (_("Save As..."), "app.save_as");
-            menu.append (_("Email..."), "app.email");
-            menu.append (_("Print..."), "app.print");
 
-            section = new Menu ();
+            var section = new Menu ();
             appmenu.append_section (null, section);
             section.append (_("Preferences"), "app.preferences");
 
             section = new Menu ();
             appmenu.append_section (null, section);
+            section.append (_("Keyboard Shortcuts"), "win.show-help-overlay");
             section.append (_("Help"), "app.help");
             section.append (_("About"), "app.about");
             section.append (_("Quit"), "app.quit");
@@ -1858,120 +1578,77 @@ public class UserInterface : Gtk.ApplicationWindow
 
             app.add_accelerator ("<Ctrl>N", "app.new_document", null);
             app.add_accelerator ("<Ctrl>S", "app.save", null);
-            app.add_accelerator ("<Shift><Ctrl>S", "app.save_as", null);
             app.add_accelerator ("<Ctrl>E", "app.email", null);
             app.add_accelerator ("<Ctrl>P", "app.print", null);
             app.add_accelerator ("F1", "app.help", null);
             app.add_accelerator ("<Ctrl>Q", "app.quit", null);
+
+            var gear_menu = new Menu ();
+            section = new Menu ();
+            gear_menu.append_section (null, section);
+            section.append (_("Email"), "app.email");
+            section.append (_("Reorder Pages"), "app.reorder");
+            section.append (_("Preferences"), "app.preferences");
+            menu_button.set_menu_model (gear_menu);
         }
         app.add_window (this);
 
-        /* Add InfoBar (not supported in Glade) */
-        info_bar = new Gtk.InfoBar ();
-        info_bar.response.connect (info_bar_response_cb);
-        main_vbox.pack_start (info_bar, false, true, 0);
-        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12);
-        var content_area = info_bar.get_content_area () as Gtk.Container;
-        content_area.add (hbox);
-        hbox.visible = true;
-
-        info_bar_image = new Gtk.Image.from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
-        hbox.pack_start (info_bar_image, false, true, 0);
-        info_bar_image.visible = true;
-
-        info_bar_label = new Gtk.Label (null);
-        info_bar_label.set_alignment (0.0f, 0.5f);
-        hbox.pack_start (info_bar_label, true, true, 0);
-        info_bar_label.visible = true;
-
-        info_bar_close_button = info_bar.add_button (_("_Close"), Gtk.ResponseType.CLOSE) as Gtk.Button;
-        info_bar_change_scanner_button = info_bar.add_button (/* Button in error infobar to open preferences dialog and change scanner */
-                                                              _("Change _Scanner"), 1) as Gtk.Button;
-        info_bar_install_button = info_bar.add_button (/* Button in error infobar to prompt user to install drivers */
-                                                       _("_Install Drivers"), 2) as Gtk.Button;
+        /* Populate ActionBar (not supported in Glade) */
+        /* https://bugzilla.gnome.org/show_bug.cgi?id=769966 */
+        var button = new Gtk.Button.with_label (/* Label on new document button */
+                                               _("Start Again…"));
+        button.visible = true;
+        button.clicked.connect (new_button_clicked_cb);
+        action_bar.pack_start (button);
 
-        Gtk.TreeIter iter;
-        paper_size_model.append (out iter);
-        paper_size_model.set (iter, 0, 0, 1, 0, 2,
-                              /* Combo box value for automatic paper size */
-                              _("Automatic"), -1);
-        paper_size_model.append (out iter);
-        paper_size_model.set (iter, 0, 1050, 1, 1480, 2, "A6", -1);
-        paper_size_model.append (out iter);
-        paper_size_model.set (iter, 0, 1480, 1, 2100, 2, "A5", -1);
-        paper_size_model.append (out iter);
-        paper_size_model.set (iter, 0, 2100, 1, 2970, 2, "A4", -1);
-        paper_size_model.append (out iter);
-        paper_size_model.set (iter, 0, 2159, 1, 2794, 2, "Letter", -1);
-        paper_size_model.append (out iter);
-        paper_size_model.set (iter, 0, 2159, 1, 3556, 2, "Legal", -1);
-        paper_size_model.append (out iter);
-        paper_size_model.set (iter, 0, 1016, 1, 1524, 2, "4×6", -1);
-
-        var dpi = settings.get_int ("text-dpi");
-        if (dpi <= 0)
-            dpi = DEFAULT_TEXT_DPI;
-        set_dpi_combo (text_dpi_combo, DEFAULT_TEXT_DPI, dpi);
-        text_dpi_combo.changed.connect (() => { settings.set_int ("text-dpi", get_text_dpi ()); });
-        dpi = settings.get_int ("photo-dpi");
-        if (dpi <= 0)
-            dpi = DEFAULT_PHOTO_DPI;
-        set_dpi_combo (photo_dpi_combo, DEFAULT_PHOTO_DPI, dpi);
-        photo_dpi_combo.changed.connect (() => { settings.set_int ("photo-dpi", get_photo_dpi ()); });
+        var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 10);
+        box.visible = true;
+        action_bar.set_center_widget (box);
+
+        var rotate_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        rotate_box.get_style_context ().add_class (Gtk.STYLE_CLASS_LINKED);
+        rotate_box.visible = true;
+        box.pack_start (rotate_box, false, true, 0);
+
+        button = new Gtk.Button.from_icon_name ("object-rotate-left-symbolic");
+        button.visible = true;
+        /* Tooltip for rotate left (counter-clockwise) button */
+        button.tooltip_text = _("Rotate the page to the left (counter-clockwise)");
+        button.clicked.connect (rotate_left_button_clicked_cb);
+        rotate_box.pack_start (button, false, true, 0);
+
+        button = new Gtk.Button.from_icon_name ("object-rotate-right-symbolic");
+        button.visible = true;
+        /* Tooltip for rotate right (clockwise) button */
+        button.tooltip_text = _("Rotate the page to the right (clockwise)");
+        button.clicked.connect (rotate_right_button_clicked_cb);
+        rotate_box.pack_start (button, false, true, 0);
+
+        crop_button = new Gtk.ToggleButton ();
+        crop_button.visible = true;
+        var image = new Gtk.Image.from_icon_name ("edit-cut-symbolic", Gtk.IconSize.BUTTON);
+        image.visible = true;
+        crop_button.add (image);
+        /* Tooltip for crop button */
+        crop_button.tooltip_text = _("Crop the selected page");
+        crop_button.toggled.connect ((widget) =>
+        {
+            if (updating_page_menu)
+                return;
 
-        var renderer = new Gtk.CellRendererText ();
-        device_combo.pack_start (renderer, true);
-        device_combo.add_attribute (renderer, "text", 1);
-
-        renderer = new Gtk.CellRendererText ();
-        page_side_combo.pack_start (renderer, true);
-        page_side_combo.add_attribute (renderer, "text", 1);
-        set_page_side ((ScanType) settings.get_enum ("page-side"));
-        page_side_combo.changed.connect (() => { settings.set_enum ("page-side", get_page_side ()); });
-
-        renderer = new Gtk.CellRendererText ();
-        paper_size_combo.pack_start (renderer, true);
-        paper_size_combo.add_attribute (renderer, "text", 2);
-        var paper_width = settings.get_int ("paper-width");
-        var paper_height = settings.get_int ("paper-height");
-        set_paper_size (paper_width, paper_height);
-        paper_size_combo.changed.connect (() =>
-        {
-            int w, h;
-            get_paper_size (out w, out h);
-            settings.set_int ("paper-width", w);
-            settings.set_int ("paper-height", h);
+            if (widget.active)
+                custom_crop_menuitem.active = true;
+            else
+                no_crop_menuitem.active = true;
         });
+        box.pack_start (crop_button, false, true, 0);
 
-        var lower = brightness_adjustment.lower;
-        var darker_label = "<small>%s</small>".printf (_("Darker"));
-        var upper = brightness_adjustment.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);
-        brightness = settings.get_int ("brightness");
-        brightness_adjustment.value_changed.connect (() => { settings.set_int ("brightness", brightness); });
-
-        lower = contrast_adjustment.lower;
-        var less_label = "<small>%s</small>".printf (_("Less"));
-        upper = contrast_adjustment.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);
-        contrast = settings.get_int ("contrast");
-        contrast_adjustment.value_changed.connect (() => { settings.set_int ("contrast", contrast); });
-
-        lower = quality_adjustment.lower;
-        var minimum_label = "<small>%s</small>".printf (_("Minimum"));
-        upper = quality_adjustment.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);
-        quality = settings.get_int ("jpeg-quality");
-        quality_adjustment.value_changed.connect (() => { settings.set_int ("jpeg-quality", quality); });
+        delete_button = new Gtk.Button.from_icon_name ("user-trash-symbolic");
+        delete_button.visible = true;
+        /* Tooltip for delete button */
+        delete_button.tooltip_text = _("Delete the selected page");
+        delete_button.clicked.connect (() => { book_view.book.delete_page (book_view.selected_page); });
+        box.pack_start (delete_button, false, true, 0);
 
         var document_type = settings.get_string ("document-type");
         if (document_type != null)
@@ -1979,13 +1656,12 @@ public class UserInterface : Gtk.ApplicationWindow
 
         book_view = new BookView (book);
         book_view.border_width = 18;
-        main_vbox.pack_end (book_view, true, true, 0);
+        main_vbox.pack_start (book_view, true, true, 0);
         book_view.page_selected.connect (page_selected_cb);
         book_view.show_page.connect (show_page_cb);
         book_view.show_menu.connect (show_page_menu_cb);
         book_view.visible = true;
 
-        authorize_dialog.transient_for = this;
         preferences_dialog.transient_for = this;
 
         /* Load previous state */
@@ -2004,9 +1680,6 @@ public class UserInterface : Gtk.ApplicationWindow
             debug ("Restoring window to fullscreen");
             fullscreen ();
         }
-
-        progress_dialog = new ProgressBarDialog (this, _("Saving document..."));
-        book.saving.connect (book_saving_cb);
     }
 
     private bool is_desktop (string name)
@@ -2024,12 +1697,12 @@ public class UserInterface : Gtk.ApplicationWindow
 
     private bool is_traditional_desktop ()
     {
-        const string[] traditional_desktops = { "Unity", "XFCE", "MATE", "LXDE", "Cinnamon", "X-Cinnamon" };
+        const string[] traditional_desktops = { "Unity", "XFCE", "MATE", "LXDE", "Cinnamon", "X-Cinnamon", "i3" };
         foreach (var name in traditional_desktops)
             if (is_desktop (name))
                 return true;
         return false;
-    }   
+    }
 
     private string state_filename
     {
@@ -2058,25 +1731,6 @@ public class UserInterface : Gtk.ApplicationWindow
             window_height = 400;
         window_is_maximized = state_get_boolean (f, "window", "is-maximized");
         window_is_fullscreen = state_get_boolean (f, "window", "is-fullscreen");
-        default_page_width = state_get_integer (f, "last-page", "width", 595);
-        default_page_height = state_get_integer (f, "last-page", "height", 842);
-        default_page_dpi = state_get_integer (f, "last-page", "dpi", 72);
-        switch (state_get_string (f, "last-page", "scan-direction", "top-to-bottom"))
-        {
-        default:
-        case "top-to-bottom":
-            default_page_scan_direction = ScanDirection.TOP_TO_BOTTOM;
-            break;
-        case "bottom-to-top":
-            default_page_scan_direction = ScanDirection.BOTTOM_TO_TOP;
-            break;
-        case "left-to-right":
-            default_page_scan_direction = ScanDirection.LEFT_TO_RIGHT;
-            break;
-        case "right-to-left":
-            default_page_scan_direction = ScanDirection.RIGHT_TO_LEFT;
-            break;
-        }
     }
 
     private int state_get_integer (KeyFile f, string group_name, string key, int default = 0)
@@ -2103,18 +1757,6 @@ public class UserInterface : Gtk.ApplicationWindow
         }
     }
 
-    private string state_get_string (KeyFile f, string group_name, string key, string default = "")
-    {
-        try
-        {
-            return f.get_string (group_name, key);
-        }
-        catch
-        {
-            return default;
-        }
-    }
-
     private void save_state (bool force = false)
     {
         if (!force)
@@ -2136,25 +1778,7 @@ public class UserInterface : Gtk.ApplicationWindow
         f.set_integer ("window", "width", window_width);
         f.set_integer ("window", "height", window_height);
         f.set_boolean ("window", "is-maximized", window_is_maximized);
-        f.set_boolean ("window", "is-fullscreen", window_is_fullscreen);        
-        f.set_integer ("last-page", "width", default_page_width);
-        f.set_integer ("last-page", "height", default_page_height);
-        f.set_integer ("last-page", "dpi", default_page_dpi);
-        switch (default_page_scan_direction)
-        {
-        case ScanDirection.TOP_TO_BOTTOM:
-            f.set_value ("last-page", "scan-direction", "top-to-bottom");
-            break;
-        case ScanDirection.BOTTOM_TO_TOP:
-            f.set_value ("last-page", "scan-direction", "bottom-to-top");
-            break;
-        case ScanDirection.LEFT_TO_RIGHT:
-            f.set_value ("last-page", "scan-direction", "left-to-right");
-            break;
-        case ScanDirection.RIGHT_TO_LEFT:
-            f.set_value ("last-page", "scan-direction", "right-to-left");
-            break;
-        }
+        f.set_boolean ("window", "is-fullscreen", window_is_fullscreen);
         try
         {
             FileUtils.set_contents (state_filename, f.to_data ());
@@ -2165,178 +1789,52 @@ public class UserInterface : Gtk.ApplicationWindow
         }
     }
 
-    private void book_saving_cb (int page_number)
-    {
-        /* Prevent GUI from freezing */
-        while (Gtk.events_pending ())
-          Gtk.main_iteration ();
-
-        var total = (int) book.n_pages;
-        var fraction = (page_number + 1.0) / total;
-        var complete = fraction == 1.0;
-        if (complete)
-            Timeout.add (500, () => {
-                progress_dialog.visible = false;
-                return false;
-            });
-        var message = _("Saving page %d out of %d").printf (page_number + 1, total);
-
-        progress_dialog.fraction = fraction;
-        progress_dialog.message = message;
-    }
-
-    public void show_progress_dialog ()
-    {
-        progress_dialog.visible = true;
-    }
-
-    public void hide_progress_dialog ()
-    {
-        progress_dialog.visible = false;
-    }
-
-    public void show_error (string error_title, string error_text, bool change_scanner_hint)
-    {
-        have_error = true;
-        this.error_title = error_title;
-        this.error_text = error_text;
-        error_change_scanner_hint = change_scanner_hint;
-        update_info_bar ();
-    }
-
     public void start ()
     {
         visible = true;
     }
 }
 
-private class ProgressBarDialog : Gtk.Window
+private class CancellableProgressBar : Gtk.HBox
 {
     private Gtk.ProgressBar bar;
+    private Gtk.Button? button;
 
-    public double fraction
-    {
-        get { return bar.fraction; }
-        set { bar.fraction = value; }
-    }
-
-    public string message
-    {
-        get { return bar.text; }
-        set { bar.text = value; }
-    }
-
-    public ProgressBarDialog (Gtk.ApplicationWindow parent, string title)
+    public CancellableProgressBar (string? text, Cancellable? cancellable)
     {
         bar = new Gtk.ProgressBar ();
-        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 5);
-        var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 5);
-        hbox.hexpand = true;
-
-        bar.text = "";
-        bar.show_text = true;
-        bar.set_size_request (225, 25);
-        set_size_request (250, 50);
-
-        vbox.pack_start (bar, true, false, 0);
-        hbox.pack_start (vbox, true, false, 0);
-        add (hbox);
-        this.title = title;
-
-        transient_for = parent;
-        set_position (Gtk.WindowPosition.CENTER_ON_PARENT);
-        modal = true;
-        resizable = false;
-
-        hbox.visible = true;
-        vbox.visible = true;
         bar.visible = true;
-    }
-}
-
-// FIXME: Duplicated from simple-scan.vala
-private string? get_temporary_filename (string prefix, string extension)
-{
-    /* NOTE: I'm not sure if this is a 100% safe strategy to use g_file_open_tmp(), close and
-     * use the filename but it appears to work in practise */
-
-    var filename = "%sXXXXXX.%s".printf (prefix, extension);
-    string path;
-    try
-    {
-        var fd = FileUtils.open_tmp (filename, out path);
-        Posix.close (fd);
-    }
-    catch (Error e)
-    {
-        warning ("Error saving email attachment: %s", e.message);
-        return null;
-    }
-
-    return path;
-}
+        bar.set_text (text);
+        bar.set_show_text (true);
+        pack_start (bar);
 
-private class PageIcon : Gtk.DrawingArea
-{
-    private string text;
-    private double r;
-    private double g;
-    private double b;
-    private const int MINIMUM_WIDTH = 20;
-
-    public PageIcon (string text, double r = 1.0, double g = 1.0, double b = 1.0)
-    {
-        this.text = text;
-        this.r = r;
-        this.g = g;
-        this.b = b;
-    }
-
-    public override void get_preferred_width (out int minimum_width, out int natural_width)
-    {
-        minimum_width = natural_width = MINIMUM_WIDTH;
-    }
-
-    public override void get_preferred_height (out int minimum_height, out int natural_height)
-    {
-        minimum_height = natural_height = (int) Math.round (MINIMUM_WIDTH * Math.SQRT2);
-    }
-
-    public override void get_preferred_height_for_width (int width, out int minimum_height, out int natural_height)
-    {
-        minimum_height = natural_height = (int) (width * Math.SQRT2);
+        if (cancellable != null)
+        {
+            button = new Gtk.Button.with_label (/* Text of button for cancelling save */
+                                                _("Cancel"));
+            button.visible = true;
+            button.clicked.connect (() =>
+            {
+                set_visible (false);
+                cancellable.cancel ();
+            });
+            pack_start (button);
+        }
     }
 
-    public override void get_preferred_width_for_height (int height, out int minimum_width, out int natural_width)
+    public void set_fraction (double fraction)
     {
-        minimum_width = natural_width = (int) (height / Math.SQRT2);
+        bar.set_fraction (fraction);
     }
 
-    public override bool draw (Cairo.Context c)
+    public void destroy_with_delay (uint delay)
     {
-        var w = get_allocated_width ();
-        var h = get_allocated_height ();
-        if (w * Math.SQRT2 > h)
-            w = (int) Math.round (h / Math.SQRT2);
-        else
-            h = (int) Math.round (w * Math.SQRT2);
-
-        c.translate ((get_allocated_width () - w) / 2, (get_allocated_height () - h) / 2);
-
-        c.rectangle (0.5, 0.5, w - 1, h - 1);
-
-        c.set_source_rgb (r, g, b);
-        c.fill_preserve ();
+        button.set_sensitive (false);
 
-        c.set_line_width (1.0);
-        c.set_source_rgb (0.0, 0.0, 0.0);
-        c.stroke ();
-
-        Cairo.TextExtents extents;
-        c.text_extents (text, out extents);
-        c.translate ((w - extents.width) * 0.5 - 0.5, (h + extents.height) * 0.5 - 0.5);
-        c.show_text (text);
-
-        return true;
+        Timeout.add (delay, () =>
+        {
+            this.destroy ();
+            return false;
+        });
     }
 }
diff --git a/src/authorize-dialog.ui b/src/authorize-dialog.ui
new file mode 100644
index 0000000..c099563
--- /dev/null
+++ b/src/authorize-dialog.ui
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.10"/>
+  <template class="AuthorizeDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">normal</property>
+    <property name="urgency_hint">True</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="authorize_button">
+                <property name="label" translatable="yes" comments="Button to submit authorization dialog">_Authorize</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="vbox5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">5</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="authorize_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" comments="This label is set dynamically and is not translated">To connect to ? you need to authorize</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid" id="grid2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
+                <child>
+                  <object class="GtkEntry" id="username_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="password_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="visibility">False</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="username_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" comments="Label beside username entry">_Username for resource:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">username_entry</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="password_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" comments="Label beside password entry">_Password:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">password_entry</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">authorize_button</action-widget>
+    </action-widgets>
+  </template>
+</interface>
diff --git a/src/authorize-dialog.vala b/src/authorize-dialog.vala
new file mode 100644
index 0000000..a6e5ab0
--- /dev/null
+++ b/src/authorize-dialog.vala
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2009-2017 Canonical Ltd.
+ * Author: Robert Ancell <robert.ancell@canonical.com>,
+ *         Eduard Gotwig <g@ox.io>
+ *
+ * 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.
+ */
+
+[GtkTemplate (ui = "/org/gnome/SimpleScan/authorize-dialog.ui")]
+private class AuthorizeDialog : Gtk.Dialog
+{
+    [GtkChild]
+    private Gtk.Label authorize_label;
+    [GtkChild]
+    private Gtk.Entry username_entry;
+    [GtkChild]
+    private Gtk.Entry password_entry;
+
+    public AuthorizeDialog (string title)
+    {
+        authorize_label.set_text (title);
+    }
+
+    public string get_username ()
+    {
+        return username_entry.text;
+    }
+
+    public string get_password ()
+    {
+        return password_entry.text;
+    }
+}
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
deleted file mode 100644
index 5ea1792..0000000
--- a/src/autosave-manager.c
+++ /dev/null
@@ -1,2725 +0,0 @@
-/* autosave-manager.c generated by valac 0.34.6, the Vala compiler
- * generated from autosave-manager.vala, do not modify */
-
-/*
- * Copyright (C) 2011 Timo Kluck
- * Authors: Timo Kluck <tkluck@infty.nl>
- *          Robert Ancell <robert.ancell@canonical.com>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 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.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gio/gio.h>
-#include <glib/gstdio.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_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 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 _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
-#define _book_unref0(var) ((var == NULL) ? NULL : (var = (book_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL)))
-
-#define TYPE_SCAN_DIRECTION (scan_direction_get_type ())
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
-#define _g_dir_close0(var) ((var == NULL) ? NULL : (var = (g_dir_close (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 {
-	guint update_timeout;
-	GHashTable* page_filenames;
-	Book* book_;
-};
-
-typedef enum  {
-	SCAN_DIRECTION_TOP_TO_BOTTOM,
-	SCAN_DIRECTION_LEFT_TO_RIGHT,
-	SCAN_DIRECTION_BOTTOM_TO_TOP,
-	SCAN_DIRECTION_RIGHT_TO_LEFT
-} ScanDirection;
-
-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_FILENAME;
-static gchar* autosave_manager_AUTOSAVE_FILENAME = NULL;
-static gchar* autosave_manager_AUTOSAVE_PATH;
-static gchar* autosave_manager_AUTOSAVE_PATH = NULL;
-
-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 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;
-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;
-#define AUTOSAVE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AUTOSAVE_MANAGER, AutosaveManagerPrivate))
-enum  {
-	AUTOSAVE_MANAGER_DUMMY_PROPERTY
-};
-AutosaveManager* autosave_manager_new (void);
-AutosaveManager* autosave_manager_construct (GType object_type);
-static void _page_unref0_ (gpointer var);
-static void _g_free0_ (gpointer var);
-void autosave_manager_load (AutosaveManager* self);
-Book* autosave_manager_get_book (AutosaveManager* self);
-void book_clear (Book* self);
-static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, const gchar* _default_);
-static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gint _default_);
-GType scan_direction_get_type (void) G_GNUC_CONST;
-static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gboolean _default_);
-Page* page_new_from_data (gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height);
-Page* page_construct_from_data (GType object_type, gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height);
-void book_append_page (Book* self, Page* page);
-void autosave_manager_cleanup (AutosaveManager* self);
-void autosave_manager_on_page_added (AutosaveManager* self, Page* page);
-void autosave_manager_on_scan_finished (AutosaveManager* self, Page* page);
-static void _autosave_manager_on_scan_finished_page_scan_finished (Page* _sender, gpointer self);
-void autosave_manager_on_changed (AutosaveManager* self);
-static void _autosave_manager_on_changed_page_crop_changed (Page* _sender, gpointer self);
-void autosave_manager_on_page_removed (AutosaveManager* self, Page* page);
-static void autosave_manager_save_pixels (AutosaveManager* self, Page* page);
-static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout);
-void autosave_manager_on_cleared (AutosaveManager* self);
-static gboolean ___lambda4_ (AutosaveManager* self);
-static void autosave_manager_real_save (AutosaveManager* self);
-static gboolean ____lambda4__gsource_func (gpointer self);
-guint book_get_n_pages (Book* self);
-Page* book_get_page (Book* self, gint page_number);
-gboolean page_get_has_data (Page* self);
-gint page_get_scan_width (Page* self);
-gint page_get_scan_height (Page* self);
-gint page_get_rowstride (Page* self);
-gint page_get_n_channels (Page* self);
-gint page_get_depth (Page* self);
-gint page_get_dpi (Page* self);
-ScanDirection page_get_scan_direction (Page* self);
-const gchar* page_get_color_profile (Page* self);
-gboolean page_get_has_crop (Page* self);
-const gchar* page_get_crop_name (Page* self);
-gint page_get_crop_x (Page* self);
-gint page_get_crop_y (Page* self);
-gint page_get_crop_width (Page* self);
-gint page_get_crop_height (Page* self);
-guchar* page_get_pixels (Page* self, int* result_length1);
-void autosave_manager_set_book (AutosaveManager* self, Book* value);
-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_changed_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 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 gint _vala_array_length (gpointer array);
-
-
-static void _page_unref0_ (gpointer var) {
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
-#line 189 "autosave-manager.c"
-}
-
-
-static void _g_free0_ (gpointer var) {
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	var = (g_free (var), NULL);
-#line 196 "autosave-manager.c"
-}
-
-
-AutosaveManager* autosave_manager_construct (GType object_type) {
-	AutosaveManager* self = NULL;
-	GHashFunc _tmp0_ = NULL;
-	GEqualFunc _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self = (AutosaveManager*) g_type_create_instance (object_type);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = g_direct_hash;
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = g_direct_equal;
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _page_unref0_, _g_free0_);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_hash_table_unref0 (self->priv->page_filenames);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->page_filenames = _tmp2_;
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return self;
-#line 219 "autosave-manager.c"
-}
-
-
-AutosaveManager* autosave_manager_new (void) {
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return autosave_manager_construct (TYPE_AUTOSAVE_MANAGER);
-#line 226 "autosave-manager.c"
-}
-
-
-static gpointer _page_ref0 (gpointer self) {
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return self ? page_ref (self) : NULL;
-#line 233 "autosave-manager.c"
-}
-
-
-void autosave_manager_load (AutosaveManager* self) {
-	Book* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-	GKeyFile* file = NULL;
-	GKeyFile* _tmp3_ = NULL;
-	gchar* pages = NULL;
-	GKeyFile* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gchar** _tmp12_ = NULL;
-	gchar** _tmp13_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:64: Loading autosave information");
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = autosave_manager_get_book (self);
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = _tmp0_;
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	book_clear (_tmp1_);
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = self->priv->page_filenames;
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_hash_table_remove_all (_tmp2_);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = g_key_file_new ();
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	file = _tmp3_;
-#line 268 "autosave-manager.c"
-	{
-		GKeyFile* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp4_ = file;
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = autosave_manager_AUTOSAVE_PATH;
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_key_file_load_from_file (_tmp4_, _tmp5_, G_KEY_FILE_NONE, &_inner_error_);
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 280 "autosave-manager.c"
-			goto __catch29_g_error;
-		}
-	}
-	goto __finally29;
-	__catch29_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp6_ = NULL;
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		e = _inner_error_;
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_inner_error_ = NULL;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = e;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (!g_error_matches (_tmp6_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 297 "autosave-manager.c"
-			GError* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp7_ = e;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp8_ = _tmp7_->message;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			g_warning ("autosave-manager.vala:77: Could not load autosave information; not res" \
-"toring any autosaves: %s", _tmp8_);
-#line 306 "autosave-manager.c"
-		}
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_key_file_unref0 (file);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return;
-#line 314 "autosave-manager.c"
-	}
-	__finally29:
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_key_file_unref0 (file);
-#line 70 "/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 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_clear_error (&_inner_error_);
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return;
-#line 327 "autosave-manager.c"
-	}
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp9_ = file;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp10_ = autosave_manager_get_value (self, _tmp9_, "simple-scan", "pages", "");
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	pages = _tmp10_;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp11_ = pages;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp13_ = _tmp12_ = g_strsplit (_tmp11_, " ", 0);
-#line 339 "autosave-manager.c"
-	{
-		gchar** page_name_collection = NULL;
-		gint page_name_collection_length1 = 0;
-		gint _page_name_collection_size_ = 0;
-		gint page_name_it = 0;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		page_name_collection = _tmp13_;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		page_name_collection_length1 = _vala_array_length (_tmp12_);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		for (page_name_it = 0; page_name_it < _vala_array_length (_tmp12_); page_name_it = page_name_it + 1) {
-#line 351 "autosave-manager.c"
-			gchar* _tmp14_ = NULL;
-			gchar* page_name = NULL;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp14_ = g_strdup (page_name_collection[page_name_it]);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			page_name = _tmp14_;
-#line 358 "autosave-manager.c"
-			{
-				const gchar* _tmp15_ = NULL;
-				gint scan_width = 0;
-				GKeyFile* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
-				gint scan_height = 0;
-				GKeyFile* _tmp19_ = NULL;
-				const gchar* _tmp20_ = NULL;
-				gint _tmp21_ = 0;
-				gint rowstride = 0;
-				GKeyFile* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				gint _tmp24_ = 0;
-				gint n_channels = 0;
-				GKeyFile* _tmp25_ = NULL;
-				const gchar* _tmp26_ = NULL;
-				gint _tmp27_ = 0;
-				gint depth = 0;
-				GKeyFile* _tmp28_ = NULL;
-				const gchar* _tmp29_ = NULL;
-				gint _tmp30_ = 0;
-				gint dpi = 0;
-				GKeyFile* _tmp31_ = NULL;
-				const gchar* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gchar* scan_direction_name = NULL;
-				GKeyFile* _tmp34_ = NULL;
-				const gchar* _tmp35_ = NULL;
-				gchar* _tmp36_ = NULL;
-				ScanDirection scan_direction = 0;
-				const gchar* _tmp37_ = NULL;
-				const gchar* _tmp38_ = NULL;
-				GQuark _tmp40_ = 0U;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp39_label0 = 0;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp39_label1 = 0;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp39_label2 = 0;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp39_label3 = 0;
-#line 401 "autosave-manager.c"
-				gchar* color_profile = NULL;
-				GKeyFile* _tmp41_ = NULL;
-				const gchar* _tmp42_ = NULL;
-				gchar* _tmp43_ = NULL;
-				const gchar* _tmp44_ = NULL;
-				gchar* pixels_filename = NULL;
-				GKeyFile* _tmp45_ = NULL;
-				const gchar* _tmp46_ = NULL;
-				gchar* _tmp47_ = NULL;
-				gboolean has_crop = FALSE;
-				GKeyFile* _tmp48_ = NULL;
-				const gchar* _tmp49_ = NULL;
-				gboolean _tmp50_ = FALSE;
-				gchar* crop_name = NULL;
-				GKeyFile* _tmp51_ = NULL;
-				const gchar* _tmp52_ = NULL;
-				gchar* _tmp53_ = NULL;
-				const gchar* _tmp54_ = NULL;
-				gint crop_x = 0;
-				GKeyFile* _tmp55_ = NULL;
-				const gchar* _tmp56_ = NULL;
-				gint _tmp57_ = 0;
-				gint crop_y = 0;
-				GKeyFile* _tmp58_ = NULL;
-				const gchar* _tmp59_ = NULL;
-				gint _tmp60_ = 0;
-				gint crop_width = 0;
-				GKeyFile* _tmp61_ = NULL;
-				const gchar* _tmp62_ = NULL;
-				gint _tmp63_ = 0;
-				gint crop_height = 0;
-				GKeyFile* _tmp64_ = NULL;
-				const gchar* _tmp65_ = NULL;
-				gint _tmp66_ = 0;
-				guchar* pixels = NULL;
-				gint pixels_length1 = 0;
-				gint _pixels_size_ = 0;
-				const gchar* _tmp67_ = NULL;
-				Page* page = NULL;
-				gint _tmp76_ = 0;
-				gint _tmp77_ = 0;
-				gint _tmp78_ = 0;
-				gint _tmp79_ = 0;
-				gint _tmp80_ = 0;
-				gint _tmp81_ = 0;
-				ScanDirection _tmp82_ = 0;
-				const gchar* _tmp83_ = NULL;
-				guchar* _tmp84_ = NULL;
-				gint _tmp84__length1 = 0;
-				gboolean _tmp85_ = FALSE;
-				const gchar* _tmp86_ = NULL;
-				gint _tmp87_ = 0;
-				gint _tmp88_ = 0;
-				gint _tmp89_ = 0;
-				gint _tmp90_ = 0;
-				Page* _tmp91_ = NULL;
-				GHashTable* _tmp92_ = NULL;
-				Page* _tmp93_ = NULL;
-				Page* _tmp94_ = NULL;
-				const gchar* _tmp95_ = NULL;
-				gchar* _tmp96_ = NULL;
-				Book* _tmp97_ = NULL;
-				Book* _tmp98_ = NULL;
-				Page* _tmp99_ = NULL;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp15_ = page_name;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_debug ("autosave-manager.vala:83: Loading automatically saved page %s", _tmp15_);
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp16_ = file;
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp17_ = page_name;
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp18_ = autosave_manager_get_integer (self, _tmp16_, _tmp17_, "scan-width", 0);
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_width = _tmp18_;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp19_ = file;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp20_ = page_name;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp21_ = autosave_manager_get_integer (self, _tmp19_, _tmp20_, "scan-height", 0);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_height = _tmp21_;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp22_ = file;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp23_ = page_name;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp24_ = autosave_manager_get_integer (self, _tmp22_, _tmp23_, "rowstride", 0);
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				rowstride = _tmp24_;
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp25_ = file;
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp26_ = page_name;
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = autosave_manager_get_integer (self, _tmp25_, _tmp26_, "n-channels", 0);
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				n_channels = _tmp27_;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp28_ = file;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = page_name;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = autosave_manager_get_integer (self, _tmp28_, _tmp29_, "depth", 0);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				depth = _tmp30_;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = file;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp32_ = page_name;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = autosave_manager_get_integer (self, _tmp31_, _tmp32_, "dpi", 0);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				dpi = _tmp33_;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = file;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = page_name;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp36_ = autosave_manager_get_value (self, _tmp34_, _tmp35_, "scan-direction", "");
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_direction_name = _tmp36_;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp37_ = scan_direction_name;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp38_ = _tmp37_;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp40_ = (NULL == _tmp38_) ? 0 : g_quark_from_string (_tmp38_);
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp40_ == ((0 != _tmp39_label0) ? _tmp39_label0 : (_tmp39_label0 = g_quark_from_static_string ("TOP_TO_BOTTOM")))) {
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					switch (0) {
-#line 538 "autosave-manager.c"
-						default:
-						{
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							break;
-#line 545 "autosave-manager.c"
-						}
-					}
-				} else if (_tmp40_ == ((0 != _tmp39_label1) ? _tmp39_label1 : (_tmp39_label1 = g_quark_from_static_string ("LEFT_TO_RIGHT")))) {
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					switch (0) {
-#line 551 "autosave-manager.c"
-						default:
-						{
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							break;
-#line 558 "autosave-manager.c"
-						}
-					}
-				} else if (_tmp40_ == ((0 != _tmp39_label2) ? _tmp39_label2 : (_tmp39_label2 = g_quark_from_static_string ("BOTTOM_TO_TOP")))) {
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					switch (0) {
-#line 564 "autosave-manager.c"
-						default:
-						{
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							break;
-#line 571 "autosave-manager.c"
-						}
-					}
-				} else if (_tmp40_ == ((0 != _tmp39_label3) ? _tmp39_label3 : (_tmp39_label3 = g_quark_from_static_string ("RIGHT_TO_LEFT")))) {
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					switch (0) {
-#line 577 "autosave-manager.c"
-						default:
-						{
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							break;
-#line 584 "autosave-manager.c"
-						}
-					}
-				}
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp41_ = file;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp42_ = page_name;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp43_ = autosave_manager_get_value (self, _tmp41_, _tmp42_, "color-profile", "");
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				color_profile = _tmp43_;
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp44_ = color_profile;
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp44_, "") == 0) {
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (color_profile);
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					color_profile = NULL;
-#line 604 "autosave-manager.c"
-				}
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp45_ = file;
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp46_ = page_name;
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp47_ = autosave_manager_get_value (self, _tmp45_, _tmp46_, "pixels-filename", "");
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				pixels_filename = _tmp47_;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp48_ = file;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp49_ = page_name;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp50_ = autosave_manager_get_boolean (self, _tmp48_, _tmp49_, "has-crop", FALSE);
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				has_crop = _tmp50_;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp51_ = file;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp52_ = page_name;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp53_ = autosave_manager_get_value (self, _tmp51_, _tmp52_, "crop-name", "");
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_name = _tmp53_;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp54_ = crop_name;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp54_, "") == 0) {
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (crop_name);
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					crop_name = NULL;
-#line 638 "autosave-manager.c"
-				}
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp55_ = file;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp56_ = page_name;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp57_ = autosave_manager_get_integer (self, _tmp55_, _tmp56_, "crop-x", 0);
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_x = _tmp57_;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp58_ = file;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp59_ = page_name;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp60_ = autosave_manager_get_integer (self, _tmp58_, _tmp59_, "crop-y", 0);
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_y = _tmp60_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp61_ = file;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp62_ = page_name;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp63_ = autosave_manager_get_integer (self, _tmp61_, _tmp62_, "crop-width", 0);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_width = _tmp63_;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp64_ = file;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp65_ = page_name;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp66_ = autosave_manager_get_integer (self, _tmp64_, _tmp65_, "crop-height", 0);
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_height = _tmp66_;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				pixels = NULL;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				pixels_length1 = 0;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_pixels_size_ = pixels_length1;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp67_ = pixels_filename;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp67_, "") != 0) {
-#line 682 "autosave-manager.c"
-					gchar* path = NULL;
-					const gchar* _tmp68_ = NULL;
-					const gchar* _tmp69_ = NULL;
-					gchar* _tmp70_ = NULL;
-					GFile* f = NULL;
-					const gchar* _tmp71_ = NULL;
-					GFile* _tmp72_ = NULL;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp68_ = autosave_manager_AUTOSAVE_DIR;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp69_ = pixels_filename;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp70_ = g_build_filename (_tmp68_, _tmp69_, NULL);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					path = _tmp70_;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp71_ = path;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp72_ = g_file_new_for_path (_tmp71_);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					f = _tmp72_;
-#line 704 "autosave-manager.c"
-					{
-						GFile* _tmp73_ = NULL;
-						guint8* _tmp74_ = NULL;
-						gsize _tmp75_;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp73_ = f;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_file_load_contents (_tmp73_, NULL, &_tmp74_, &_tmp75_, NULL, &_inner_error_);
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						pixels = (g_free (pixels), NULL);
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						pixels = _tmp74_;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						pixels_length1 = _tmp75_;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_pixels_size_ = pixels_length1;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 723 "autosave-manager.c"
-							goto __catch30_g_error;
-						}
-					}
-					goto __finally30;
-					__catch30_g_error:
-					{
-						GError* e = NULL;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						e = _inner_error_;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_inner_error_ = NULL;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_warning ("autosave-manager.vala:132: Failed to load pixel information");
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_error_free0 (e);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_object_unref0 (f);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (path);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						pixels = (g_free (pixels), NULL);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (crop_name);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (pixels_filename);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (color_profile);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (scan_direction_name);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (page_name);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						continue;
-#line 757 "autosave-manager.c"
-					}
-					__finally30:
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_object_unref0 (f);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (path);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						pixels = (g_free (pixels), NULL);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (crop_name);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (pixels_filename);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (color_profile);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (scan_direction_name);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (page_name);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_free0 (pages);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_g_key_file_unref0 (file);
-#line 126 "/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 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_clear_error (&_inner_error_);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						return;
-#line 790 "autosave-manager.c"
-					}
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_object_unref0 (f);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (path);
-#line 796 "autosave-manager.c"
-				}
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp76_ = scan_width;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp77_ = scan_height;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp78_ = rowstride;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp79_ = n_channels;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp80_ = depth;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp81_ = dpi;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp82_ = scan_direction;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp83_ = color_profile;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp84_ = pixels;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp84__length1 = pixels_length1;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp85_ = has_crop;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp86_ = crop_name;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp87_ = crop_x;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp88_ = crop_y;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp89_ = crop_width;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp90_ = crop_height;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp91_ = page_new_from_data (_tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp84__length1, _tmp85_, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp90_);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp91_;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp92_ = self->priv->page_filenames;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp93_ = page;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp94_ = _page_ref0 (_tmp93_);
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp95_ = pixels_filename;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp96_ = g_strdup (_tmp95_);
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_hash_table_insert (_tmp92_, _tmp94_, _tmp96_);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp97_ = autosave_manager_get_book (self);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp98_ = _tmp97_;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp99_ = page;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				book_append_page (_tmp98_, _tmp99_);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_page_unref0 (page);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				pixels = (g_free (pixels), NULL);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (crop_name);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (pixels_filename);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (color_profile);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (scan_direction_name);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (page_name);
-#line 868 "autosave-manager.c"
-			}
-		}
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 873 "autosave-manager.c"
-	}
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (pages);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_key_file_unref0 (file);
-#line 879 "autosave-manager.c"
-}
-
-
-static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, const gchar* _default_) {
-	gchar* result = NULL;
-	GError * _inner_error_ = NULL;
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (file != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (group_name != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (key != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 896 "autosave-manager.c"
-	{
-		gchar* _tmp0_ = NULL;
-		GKeyFile* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp1_ = file;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp2_ = group_name;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp3_ = key;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp4_ = g_key_file_get_value (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp0_ = _tmp4_;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 916 "autosave-manager.c"
-			goto __catch31_g_error;
-		}
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = _tmp0_;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp0_ = NULL;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp5_;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp0_);
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return result;
-#line 929 "autosave-manager.c"
-	}
-	goto __finally31;
-	__catch31_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		e = _inner_error_;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_inner_error_ = NULL;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = _default_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp7_ = g_strdup (_tmp6_);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp7_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return result;
-#line 951 "autosave-manager.c"
-	}
-	__finally31:
-#line 159 "/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 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_clear_error (&_inner_error_);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return NULL;
-#line 960 "autosave-manager.c"
-}
-
-
-static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gint _default_) {
-	gint result = 0;
-	gint _tmp6_ = 0;
-	GError * _inner_error_ = NULL;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (file != NULL, 0);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (group_name != NULL, 0);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (key != NULL, 0);
-#line 976 "autosave-manager.c"
-	{
-		gint _tmp0_ = 0;
-		GKeyFile* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp1_ = file;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp2_ = group_name;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp3_ = key;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp0_ = _tmp4_;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 995 "autosave-manager.c"
-			goto __catch32_g_error;
-		}
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp0_;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return result;
-#line 1002 "autosave-manager.c"
-	}
-	goto __finally32;
-	__catch32_g_error:
-	{
-		GError* e = NULL;
-		gint _tmp5_ = 0;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		e = _inner_error_;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_inner_error_ = NULL;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = _default_;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp5_;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return result;
-#line 1021 "autosave-manager.c"
-	}
-	__finally32:
-#line 171 "/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 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_clear_error (&_inner_error_);
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return _tmp6_;
-#line 1030 "autosave-manager.c"
-}
-
-
-static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gboolean _default_) {
-	gboolean result = FALSE;
-	gboolean _tmp6_ = FALSE;
-	GError * _inner_error_ = NULL;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (file != NULL, FALSE);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (key != NULL, FALSE);
-#line 1046 "autosave-manager.c"
-	{
-		gboolean _tmp0_ = FALSE;
-		GKeyFile* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp1_ = file;
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp2_ = group_name;
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp3_ = key;
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp0_ = _tmp4_;
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1065 "autosave-manager.c"
-			goto __catch33_g_error;
-		}
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp0_;
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return result;
-#line 1072 "autosave-manager.c"
-	}
-	goto __finally33;
-	__catch33_g_error:
-	{
-		GError* e = NULL;
-		gboolean _tmp5_ = FALSE;
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		e = _inner_error_;
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_inner_error_ = NULL;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = _default_;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp5_;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return result;
-#line 1091 "autosave-manager.c"
-	}
-	__finally33:
-#line 183 "/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 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_clear_error (&_inner_error_);
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return _tmp6_;
-#line 1100 "autosave-manager.c"
-}
-
-
-void autosave_manager_cleanup (AutosaveManager* self) {
-	guint _tmp0_ = 0U;
-	GDir* dir = NULL;
-	GError * _inner_error_ = NULL;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:195: Deleting autosave records");
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = self->priv->update_timeout;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp0_ > ((guint) 0)) {
-#line 1116 "autosave-manager.c"
-		guint _tmp1_ = 0U;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp1_ = self->priv->update_timeout;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_source_remove (_tmp1_);
-#line 1122 "autosave-manager.c"
-	}
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->update_timeout = (guint) 0;
-#line 1126 "autosave-manager.c"
-	{
-		GDir* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		GDir* _tmp4_ = NULL;
-		GDir* _tmp5_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp3_ = autosave_manager_AUTOSAVE_DIR;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp4_ = g_dir_open (_tmp3_, (guint) 0, &_inner_error_);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp2_ = _tmp4_;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1140 "autosave-manager.c"
-			goto __catch34_g_error;
-		}
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = _tmp2_;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp2_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_dir_close0 (dir);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		dir = _tmp5_;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_dir_close0 (_tmp2_);
-#line 1153 "autosave-manager.c"
-	}
-	goto __finally34;
-	__catch34_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		e = _inner_error_;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_inner_error_ = NULL;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = e;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp7_ = _tmp6_->message;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:208: Failed to delete autosaves: %s", _tmp7_);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_dir_close0 (dir);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return;
-#line 1177 "autosave-manager.c"
-	}
-	__finally34:
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_dir_close0 (dir);
-#line 202 "/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 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_clear_error (&_inner_error_);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return;
-#line 1190 "autosave-manager.c"
-	}
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	while (TRUE) {
-#line 1194 "autosave-manager.c"
-		gchar* filename = NULL;
-		GDir* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gchar* path = NULL;
-		const gchar* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp8_ = dir;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp9_ = g_dir_read_name (_tmp8_);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp10_ = g_strdup (_tmp9_);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		filename = _tmp10_;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp11_ = filename;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp11_ == NULL) {
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_g_free0 (filename);
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			break;
-#line 1221 "autosave-manager.c"
-		}
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp12_ = autosave_manager_AUTOSAVE_DIR;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp13_ = filename;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp14_ = g_build_filename (_tmp12_, _tmp13_, NULL);
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		path = _tmp14_;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp15_ = path;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_unlink (_tmp15_);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (path);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (filename);
-#line 1239 "autosave-manager.c"
-	}
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_dir_close0 (dir);
-#line 1243 "autosave-manager.c"
-}
-
-
-static void _autosave_manager_on_scan_finished_page_scan_finished (Page* _sender, gpointer self) {
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_scan_finished ((AutosaveManager*) self, _sender);
-#line 1250 "autosave-manager.c"
-}
-
-
-static void _autosave_manager_on_changed_page_crop_changed (Page* _sender, gpointer self) {
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_changed ((AutosaveManager*) self);
-#line 1257 "autosave-manager.c"
-}
-
-
-void autosave_manager_on_page_added (AutosaveManager* self, Page* page) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (page != NULL);
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = page;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp0_, "scan-finished", (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = page;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp1_, "crop-changed", (GCallback) _autosave_manager_on_changed_page_crop_changed, self);
-#line 1276 "autosave-manager.c"
-}
-
-
-void autosave_manager_on_page_removed (AutosaveManager* self, Page* page) {
-	Page* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	Page* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gchar* filename = NULL;
-	GHashTable* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-	gconstpointer _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GHashTable* _tmp10_ = NULL;
-	Page* _tmp11_ = NULL;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (page != NULL);
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = page;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_parse_name ("scan-finished", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 230 "/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_scan_finished_page_scan_finished, self);
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = page;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 231 "/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_changed_page_crop_changed, self);
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = self->priv->page_filenames;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = page;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	filename = _tmp7_;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp8_ = filename;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp8_ != NULL) {
-#line 1323 "autosave-manager.c"
-		const gchar* _tmp9_ = NULL;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp9_ = filename;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_unlink (_tmp9_);
-#line 1329 "autosave-manager.c"
-	}
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp10_ = self->priv->page_filenames;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp11_ = page;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_hash_table_remove (_tmp10_, _tmp11_);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (filename);
-#line 1339 "autosave-manager.c"
-}
-
-
-void autosave_manager_on_scan_finished (AutosaveManager* self, Page* page) {
-	Page* _tmp0_ = NULL;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (page != NULL);
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = page;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_save_pixels (self, _tmp0_);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_save (self, FALSE);
-#line 1355 "autosave-manager.c"
-}
-
-
-void autosave_manager_on_changed (AutosaveManager* self) {
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_save (self, TRUE);
-#line 1364 "autosave-manager.c"
-}
-
-
-void autosave_manager_on_cleared (AutosaveManager* self) {
-	GHashTable* _tmp0_ = NULL;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = self->priv->page_filenames;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_hash_table_remove_all (_tmp0_);
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_save (self, TRUE);
-#line 1378 "autosave-manager.c"
-}
-
-
-static gboolean ___lambda4_ (AutosaveManager* self) {
-	gboolean result = FALSE;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_real_save (self);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->update_timeout = (guint) 0;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	result = FALSE;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return result;
-#line 1392 "autosave-manager.c"
-}
-
-
-static gboolean ____lambda4__gsource_func (gpointer self) {
-	gboolean result;
-	result = ___lambda4_ ((AutosaveManager*) self);
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return result;
-#line 1401 "autosave-manager.c"
-}
-
-
-static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout) {
-	gboolean _tmp0_ = FALSE;
-	guint _tmp1_ = 0U;
-	guint _tmp3_ = 0U;
-	gboolean _tmp5_ = FALSE;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = self->priv->update_timeout;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp1_ == ((guint) 0)) {
-#line 1416 "autosave-manager.c"
-		gboolean _tmp2_ = FALSE;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp2_ = do_timeout;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp0_ = _tmp2_;
-#line 1422 "autosave-manager.c"
-	} else {
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp0_ = FALSE;
-#line 1426 "autosave-manager.c"
-	}
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp0_) {
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_debug ("autosave-manager.vala:259: Waiting to autosave...");
-#line 1432 "autosave-manager.c"
-	}
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = self->priv->update_timeout;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp3_ > ((guint) 0)) {
-#line 1438 "autosave-manager.c"
-		guint _tmp4_ = 0U;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp4_ = self->priv->update_timeout;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_source_remove (_tmp4_);
-#line 1444 "autosave-manager.c"
-	}
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->update_timeout = (guint) 0;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = do_timeout;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp5_) {
-#line 1452 "autosave-manager.c"
-		guint _tmp6_ = 0U;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda4__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		self->priv->update_timeout = _tmp6_;
-#line 1458 "autosave-manager.c"
-	} else {
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		autosave_manager_real_save (self);
-#line 1462 "autosave-manager.c"
-	}
-}
-
-
-static void autosave_manager_real_save (AutosaveManager* self) {
-	GKeyFile* file = NULL;
-	GKeyFile* _tmp0_ = NULL;
-	gchar* page_names = NULL;
-	gchar* _tmp1_ = NULL;
-	GKeyFile* _tmp109_ = NULL;
-	const gchar* _tmp110_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:281: Autosaving book information");
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = g_key_file_new ();
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	file = _tmp0_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = g_strdup ("");
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	page_names = _tmp1_;
-#line 1487 "autosave-manager.c"
-	{
-		gint i = 0;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		i = 0;
-#line 1492 "autosave-manager.c"
-		{
-			gboolean _tmp2_ = FALSE;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp2_ = TRUE;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			while (TRUE) {
-#line 1499 "autosave-manager.c"
-				gint _tmp4_ = 0;
-				Book* _tmp5_ = NULL;
-				Book* _tmp6_ = NULL;
-				guint _tmp7_ = 0U;
-				guint _tmp8_ = 0U;
-				Page* page = NULL;
-				Book* _tmp9_ = NULL;
-				Book* _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				Page* _tmp12_ = NULL;
-				Page* _tmp13_ = NULL;
-				gboolean _tmp14_ = FALSE;
-				gboolean _tmp15_ = FALSE;
-				gchar* page_name = NULL;
-				gint _tmp16_ = 0;
-				gchar* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				const gchar* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
-				const gchar* _tmp24_ = NULL;
-				GKeyFile* _tmp25_ = NULL;
-				const gchar* _tmp26_ = NULL;
-				Page* _tmp27_ = NULL;
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
-				GKeyFile* _tmp30_ = NULL;
-				const gchar* _tmp31_ = NULL;
-				Page* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gint _tmp34_ = 0;
-				GKeyFile* _tmp35_ = NULL;
-				const gchar* _tmp36_ = NULL;
-				Page* _tmp37_ = NULL;
-				gint _tmp38_ = 0;
-				gint _tmp39_ = 0;
-				GKeyFile* _tmp40_ = NULL;
-				const gchar* _tmp41_ = NULL;
-				Page* _tmp42_ = NULL;
-				gint _tmp43_ = 0;
-				gint _tmp44_ = 0;
-				GKeyFile* _tmp45_ = NULL;
-				const gchar* _tmp46_ = NULL;
-				Page* _tmp47_ = NULL;
-				gint _tmp48_ = 0;
-				gint _tmp49_ = 0;
-				GKeyFile* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				Page* _tmp52_ = NULL;
-				gint _tmp53_ = 0;
-				gint _tmp54_ = 0;
-				Page* _tmp55_ = NULL;
-				ScanDirection _tmp56_ = 0;
-				ScanDirection _tmp57_ = 0;
-				const gchar* _tmp66_ = NULL;
-				Page* _tmp67_ = NULL;
-				const gchar* _tmp68_ = NULL;
-				const gchar* _tmp69_ = NULL;
-				GKeyFile* _tmp70_ = NULL;
-				const gchar* _tmp71_ = NULL;
-				const gchar* _tmp72_ = NULL;
-				GHashTable* _tmp73_ = NULL;
-				Page* _tmp74_ = NULL;
-				gconstpointer _tmp75_ = NULL;
-				GKeyFile* _tmp76_ = NULL;
-				const gchar* _tmp77_ = NULL;
-				GKeyFile* _tmp78_ = NULL;
-				const gchar* _tmp79_ = NULL;
-				Page* _tmp80_ = NULL;
-				gboolean _tmp81_ = FALSE;
-				gboolean _tmp82_ = FALSE;
-				const gchar* _tmp83_ = NULL;
-				Page* _tmp84_ = NULL;
-				const gchar* _tmp85_ = NULL;
-				const gchar* _tmp86_ = NULL;
-				GKeyFile* _tmp87_ = NULL;
-				const gchar* _tmp88_ = NULL;
-				GKeyFile* _tmp89_ = NULL;
-				const gchar* _tmp90_ = NULL;
-				Page* _tmp91_ = NULL;
-				gint _tmp92_ = 0;
-				gint _tmp93_ = 0;
-				GKeyFile* _tmp94_ = NULL;
-				const gchar* _tmp95_ = NULL;
-				Page* _tmp96_ = NULL;
-				gint _tmp97_ = 0;
-				gint _tmp98_ = 0;
-				GKeyFile* _tmp99_ = NULL;
-				const gchar* _tmp100_ = NULL;
-				Page* _tmp101_ = NULL;
-				gint _tmp102_ = 0;
-				gint _tmp103_ = 0;
-				GKeyFile* _tmp104_ = NULL;
-				const gchar* _tmp105_ = NULL;
-				Page* _tmp106_ = NULL;
-				gint _tmp107_ = 0;
-				gint _tmp108_ = 0;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp2_) {
-#line 1599 "autosave-manager.c"
-					gint _tmp3_ = 0;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp3_ = i;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					i = _tmp3_ + 1;
-#line 1605 "autosave-manager.c"
-				}
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp2_ = FALSE;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp4_ = i;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp5_ = autosave_manager_get_book (self);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp6_ = _tmp5_;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp7_ = book_get_n_pages (_tmp6_);
-#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"
-				if (!(((guint) _tmp4_) < _tmp8_)) {
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					break;
-#line 1623 "autosave-manager.c"
-				}
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp9_ = autosave_manager_get_book (self);
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp10_ = _tmp9_;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp11_ = i;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp12_ = book_get_page (_tmp10_, _tmp11_);
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp12_;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp13_ = page;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp14_ = page_get_has_data (_tmp13_);
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp15_ = _tmp14_;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp15_) {
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_page_unref0 (page);
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					continue;
-#line 1647 "autosave-manager.c"
-				}
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp16_ = i;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp17_ = g_strdup_printf ("page-%d", _tmp16_);
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page_name = _tmp17_;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp18_ = page_names;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp18_, "") != 0) {
-#line 1659 "autosave-manager.c"
-					const gchar* _tmp19_ = NULL;
-					gchar* _tmp20_ = NULL;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp19_ = page_names;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp20_ = g_strconcat (_tmp19_, " ", NULL);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (page_names);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					page_names = _tmp20_;
-#line 1670 "autosave-manager.c"
-				}
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp21_ = page_names;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp22_ = page_name;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp23_ = g_strconcat (_tmp21_, _tmp22_, NULL);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (page_names);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page_names = _tmp23_;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp24_ = page_name;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_debug ("autosave-manager.vala:298: Autosaving page %s", _tmp24_);
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp25_ = file;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp26_ = page_name;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = page;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp28_ = page_get_scan_width (_tmp27_);
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = _tmp28_;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp25_, _tmp26_, "scan-width", _tmp29_);
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = file;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = page_name;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp32_ = page;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = page_get_scan_height (_tmp32_);
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = _tmp33_;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp30_, _tmp31_, "scan-height", _tmp34_);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = file;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp36_ = page_name;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp37_ = page;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp38_ = page_get_rowstride (_tmp37_);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp39_ = _tmp38_;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp35_, _tmp36_, "rowstride", _tmp39_);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp40_ = file;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp41_ = page_name;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp42_ = page;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp43_ = page_get_n_channels (_tmp42_);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp44_ = _tmp43_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp40_, _tmp41_, "n-channels", _tmp44_);
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp45_ = file;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp46_ = page_name;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp47_ = page;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp48_ = page_get_depth (_tmp47_);
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp49_ = _tmp48_;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp45_, _tmp46_, "depth", _tmp49_);
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp50_ = file;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp51_ = page_name;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp52_ = page;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp53_ = page_get_dpi (_tmp52_);
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp54_ = _tmp53_;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp50_, _tmp51_, "dpi", _tmp54_);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp55_ = page;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp56_ = page_get_scan_direction (_tmp55_);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp57_ = _tmp56_;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				switch (_tmp57_) {
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1768 "autosave-manager.c"
-					{
-						GKeyFile* _tmp58_ = NULL;
-						const gchar* _tmp59_ = NULL;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp58_ = file;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp59_ = page_name;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp58_, _tmp59_, "scan-direction", "TOP_TO_BOTTOM");
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						break;
-#line 1780 "autosave-manager.c"
-					}
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1784 "autosave-manager.c"
-					{
-						GKeyFile* _tmp60_ = NULL;
-						const gchar* _tmp61_ = NULL;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp60_ = file;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp61_ = page_name;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp60_, _tmp61_, "scan-direction", "LEFT_TO_RIGHT");
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						break;
-#line 1796 "autosave-manager.c"
-					}
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1800 "autosave-manager.c"
-					{
-						GKeyFile* _tmp62_ = NULL;
-						const gchar* _tmp63_ = NULL;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp62_ = file;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp63_ = page_name;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp62_, _tmp63_, "scan-direction", "BOTTOM_TO_TOP");
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						break;
-#line 1812 "autosave-manager.c"
-					}
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1816 "autosave-manager.c"
-					{
-						GKeyFile* _tmp64_ = NULL;
-						const gchar* _tmp65_ = NULL;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp64_ = file;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp65_ = page_name;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp64_, _tmp65_, "scan-direction", "RIGHT_TO_LEFT");
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						break;
-#line 1828 "autosave-manager.c"
-					}
-					default:
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					break;
-#line 1833 "autosave-manager.c"
-				}
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp67_ = page;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp68_ = page_get_color_profile (_tmp67_);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp69_ = _tmp68_;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp66_ = _tmp69_;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp66_ == NULL) {
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp66_ = "";
-#line 1847 "autosave-manager.c"
-				}
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp70_ = file;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp71_ = page_name;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_value (_tmp70_, _tmp71_, "color-profile", _tmp66_);
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp73_ = self->priv->page_filenames;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp74_ = page;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp75_ = g_hash_table_lookup (_tmp73_, _tmp74_);
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp72_ = (const gchar*) _tmp75_;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp72_ == NULL) {
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp72_ = "";
-#line 1867 "autosave-manager.c"
-				}
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp76_ = file;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp77_ = page_name;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_value (_tmp76_, _tmp77_, "pixels-filename", _tmp72_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp78_ = file;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp79_ = page_name;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp80_ = page;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp81_ = page_get_has_crop (_tmp80_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp82_ = _tmp81_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_boolean (_tmp78_, _tmp79_, "has-crop", _tmp82_);
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp84_ = page;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp85_ = page_get_crop_name (_tmp84_);
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp86_ = _tmp85_;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp83_ = _tmp86_;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp83_ == NULL) {
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp83_ = "";
-#line 1899 "autosave-manager.c"
-				}
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp87_ = file;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp88_ = page_name;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_value (_tmp87_, _tmp88_, "crop-name", _tmp83_);
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp89_ = file;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp90_ = page_name;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp91_ = page;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp92_ = page_get_crop_x (_tmp91_);
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp93_ = _tmp92_;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp89_, _tmp90_, "crop-x", _tmp93_);
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp94_ = file;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp95_ = page_name;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp96_ = page;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp97_ = page_get_crop_y (_tmp96_);
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp98_ = _tmp97_;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp94_, _tmp95_, "crop-y", _tmp98_);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp99_ = file;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp100_ = page_name;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp101_ = page;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp102_ = page_get_crop_width (_tmp101_);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp103_ = _tmp102_;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp99_, _tmp100_, "crop-width", _tmp103_);
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp104_ = file;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp105_ = page_name;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp106_ = page;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp107_ = page_get_crop_height (_tmp106_);
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp108_ = _tmp107_;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp104_, _tmp105_, "crop-height", _tmp108_);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (page_name);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_page_unref0 (page);
-#line 1959 "autosave-manager.c"
-			}
-		}
-	}
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp109_ = file;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp110_ = page_names;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_key_file_set_value (_tmp109_, "simple-scan", "pages", _tmp110_);
-#line 1969 "autosave-manager.c"
-	{
-		const gchar* _tmp111_ = NULL;
-		const gchar* _tmp112_ = NULL;
-		GKeyFile* _tmp113_ = NULL;
-		gchar* _tmp114_ = NULL;
-		gchar* _tmp115_ = NULL;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp111_ = autosave_manager_AUTOSAVE_DIR;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_mkdir_with_parents (_tmp111_, 0777);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp112_ = autosave_manager_AUTOSAVE_PATH;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp113_ = file;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp114_ = g_key_file_to_data (_tmp113_, NULL, NULL);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp115_ = _tmp114_;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_file_set_contents (_tmp112_, _tmp115_, (gssize) -1, &_inner_error_);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp115_);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1994 "autosave-manager.c"
-			goto __catch35_g_error;
-		}
-	}
-	goto __finally35;
-	__catch35_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp116_ = NULL;
-		const gchar* _tmp117_ = NULL;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		e = _inner_error_;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_inner_error_ = NULL;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp116_ = e;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp117_ = _tmp116_->message;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:339: Failed to write autosave: %s", _tmp117_);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
-#line 2016 "autosave-manager.c"
-	}
-	__finally35:
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (page_names);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_key_file_unref0 (file);
-#line 332 "/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 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_clear_error (&_inner_error_);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return;
-#line 2031 "autosave-manager.c"
-	}
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (page_names);
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_key_file_unref0 (file);
-#line 2037 "autosave-manager.c"
-}
-
-
-static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
-	gchar* filename = NULL;
-	GHashFunc _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	gchar* _tmp3_ = NULL;
-	gchar* path = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
-	Page* _tmp7_ = NULL;
-	Page* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	GFile* file = NULL;
-	GFile* _tmp10_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (page != NULL);
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = g_direct_hash;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = page;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = _tmp0_ (_tmp1_);
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = g_strdup_printf ("%u.pixels", _tmp2_);
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	filename = _tmp3_;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = autosave_manager_AUTOSAVE_DIR;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = g_build_filename (_tmp4_, filename, NULL);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	path = _tmp5_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = self->priv->page_filenames;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp7_ = page;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp8_ = _page_ref0 (_tmp7_);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp9_ = g_strdup (filename);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_hash_table_insert (_tmp6_, _tmp8_, _tmp9_);
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:349: Autosaving page pixels to %s", path);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp10_ = g_file_new_for_path (path);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	file = _tmp10_;
-#line 2093 "autosave-manager.c"
-	{
-		Page* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		guchar* _tmp13_ = NULL;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp11_ = page;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp13_ = page_get_pixels (_tmp11_, &_tmp12_);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_file_replace_contents (file, _tmp13_, (gsize) _tmp12_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2106 "autosave-manager.c"
-			goto __catch36_g_error;
-		}
-	}
-	goto __finally36;
-	__catch36_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		e = _inner_error_;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_inner_error_ = NULL;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp14_ = e;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp15_ = _tmp14_->message;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:358: Failed to autosave page contents: %s", _tmp15_);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
-#line 2128 "autosave-manager.c"
-	}
-	__finally36:
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_object_unref0 (file);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (path);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (filename);
-#line 352 "/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 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_clear_error (&_inner_error_);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return;
-#line 2145 "autosave-manager.c"
-	}
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_object_unref0 (file);
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (path);
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (filename);
-#line 2153 "autosave-manager.c"
-}
-
-
-Book* autosave_manager_get_book (AutosaveManager* self) {
-	Book* result;
-	Book* _tmp0_ = NULL;
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = self->priv->book_;
-#line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	result = _tmp0_;
-#line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return result;
-#line 2168 "autosave-manager.c"
-}
-
-
-static void _autosave_manager_on_page_added_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_added ((AutosaveManager*) self, page);
-#line 2175 "autosave-manager.c"
-}
-
-
-static void _autosave_manager_on_page_removed_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_removed ((AutosaveManager*) self, page);
-#line 2182 "autosave-manager.c"
-}
-
-
-static void _autosave_manager_on_changed_book_reordered (Book* _sender, gpointer self) {
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_changed ((AutosaveManager*) self);
-#line 2189 "autosave-manager.c"
-}
-
-
-static void _autosave_manager_on_cleared_book_cleared (Book* _sender, gpointer self) {
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_cleared ((AutosaveManager*) self);
-#line 2196 "autosave-manager.c"
-}
-
-
-static gpointer _book_ref0 (gpointer self) {
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return self ? book_ref (self) : NULL;
-#line 2203 "autosave-manager.c"
-}
-
-
-void autosave_manager_set_book (AutosaveManager* self, Book* value) {
-	Book* _tmp0_ = NULL;
-	Book* _tmp19_ = NULL;
-	Book* _tmp20_ = NULL;
-	Book* _tmp21_ = NULL;
-	Book* _tmp22_ = NULL;
-	Book* _tmp23_ = NULL;
-	Book* _tmp24_ = NULL;
-#line 30 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = self->priv->book_;
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp0_ != NULL) {
-#line 2221 "autosave-manager.c"
-		Book* _tmp11_ = NULL;
-		guint _tmp12_ = 0U;
-		Book* _tmp13_ = NULL;
-		guint _tmp14_ = 0U;
-		Book* _tmp15_ = NULL;
-		guint _tmp16_ = 0U;
-		Book* _tmp17_ = NULL;
-		guint _tmp18_ = 0U;
-		{
-			gint i = 0;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			i = 0;
-#line 2234 "autosave-manager.c"
-			{
-				gboolean _tmp1_ = FALSE;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp1_ = TRUE;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				while (TRUE) {
-#line 2241 "autosave-manager.c"
-					gint _tmp3_ = 0;
-					Book* _tmp4_ = NULL;
-					guint _tmp5_ = 0U;
-					guint _tmp6_ = 0U;
-					Page* page = NULL;
-					Book* _tmp7_ = NULL;
-					gint _tmp8_ = 0;
-					Page* _tmp9_ = NULL;
-					Page* _tmp10_ = NULL;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (!_tmp1_) {
-#line 2253 "autosave-manager.c"
-						gint _tmp2_ = 0;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp2_ = i;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						i = _tmp2_ + 1;
-#line 2259 "autosave-manager.c"
-					}
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp1_ = FALSE;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp3_ = i;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp4_ = self->priv->book_;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp5_ = book_get_n_pages (_tmp4_);
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp6_ = _tmp5_;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (!(((guint) _tmp3_) < _tmp6_)) {
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						break;
-#line 2275 "autosave-manager.c"
-					}
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp7_ = self->priv->book_;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp8_ = i;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp9_ = book_get_page (_tmp7_, _tmp8_);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					page = _tmp9_;
-#line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp10_ = page;
-#line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					autosave_manager_on_page_removed (self, _tmp10_);
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_page_unref0 (page);
-#line 2291 "autosave-manager.c"
-				}
-			}
-		}
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp11_ = self->priv->book_;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp12_, NULL, FALSE);
-#line 39 "/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 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp13_ = self->priv->book_;
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp14_, NULL, FALSE);
-#line 40 "/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 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp15_ = self->priv->book_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp16_, NULL, FALSE);
-#line 41 "/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_changed_book_reordered, self);
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp17_ = self->priv->book_;
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp18_, NULL, FALSE);
-#line 42 "/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 2319 "autosave-manager.c"
-	}
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp19_ = value;
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp20_ = _book_ref0 (_tmp19_);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_book_unref0 (self->priv->book_);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->book_ = _tmp20_;
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp21_ = self->priv->book_;
-#line 45 "/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 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp22_ = self->priv->book_;
-#line 46 "/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 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp23_ = self->priv->book_;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp23_, "reordered", (GCallback) _autosave_manager_on_changed_book_reordered, self);
-#line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp24_ = self->priv->book_;
-#line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp24_, "cleared", (GCallback) _autosave_manager_on_cleared_book_cleared, self);
-#line 2345 "autosave-manager.c"
-	{
-		gint i = 0;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		i = 0;
-#line 2350 "autosave-manager.c"
-		{
-			gboolean _tmp25_ = FALSE;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp25_ = TRUE;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			while (TRUE) {
-#line 2357 "autosave-manager.c"
-				gint _tmp27_ = 0;
-				Book* _tmp28_ = NULL;
-				guint _tmp29_ = 0U;
-				guint _tmp30_ = 0U;
-				Page* page = NULL;
-				Book* _tmp31_ = NULL;
-				gint _tmp32_ = 0;
-				Page* _tmp33_ = NULL;
-				Page* _tmp34_ = NULL;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp25_) {
-#line 2369 "autosave-manager.c"
-					gint _tmp26_ = 0;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp26_ = i;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					i = _tmp26_ + 1;
-#line 2375 "autosave-manager.c"
-				}
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp25_ = FALSE;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = i;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp28_ = self->priv->book_;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = book_get_n_pages (_tmp28_);
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = _tmp29_;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!(((guint) _tmp27_) < _tmp30_)) {
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					break;
-#line 2391 "autosave-manager.c"
-				}
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = self->priv->book_;
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp32_ = i;
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = book_get_page (_tmp31_, _tmp32_);
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp33_;
-#line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = page;
-#line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				autosave_manager_on_page_added (self, _tmp34_);
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_page_unref0 (page);
-#line 2407 "autosave-manager.c"
-			}
-		}
-	}
-}
-
-
-static void value_autosave_manager_init (GValue* value) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	value->data[0].v_pointer = NULL;
-#line 2417 "autosave-manager.c"
-}
-
-
-static void value_autosave_manager_free_value (GValue* value) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (value->data[0].v_pointer) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		autosave_manager_unref (value->data[0].v_pointer);
-#line 2426 "autosave-manager.c"
-	}
-}
-
-
-static void value_autosave_manager_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (src_value->data[0].v_pointer) {
-#line 13 "/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 2436 "autosave-manager.c"
-	} else {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 2440 "autosave-manager.c"
-	}
-}
-
-
-static gpointer value_autosave_manager_peek_pointer (const GValue* value) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return value->data[0].v_pointer;
-#line 2448 "autosave-manager.c"
-}
-
-
-static gchar* value_autosave_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (collect_values[0].v_pointer) {
-#line 2455 "autosave-manager.c"
-		AutosaveManager* object;
-		object = collect_values[0].v_pointer;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 13 "/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 2462 "autosave-manager.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 13 "/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 2466 "autosave-manager.c"
-		}
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		value->data[0].v_pointer = autosave_manager_ref (object);
-#line 2470 "autosave-manager.c"
-	} else {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		value->data[0].v_pointer = NULL;
-#line 2474 "autosave-manager.c"
-	}
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return NULL;
-#line 2478 "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 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (!object_p) {
-#line 13 "/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 2489 "autosave-manager.c"
-	}
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (!value->data[0].v_pointer) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		*object_p = NULL;
-#line 2495 "autosave-manager.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		*object_p = value->data[0].v_pointer;
-#line 2499 "autosave-manager.c"
-	} else {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		*object_p = autosave_manager_ref (value->data[0].v_pointer);
-#line 2503 "autosave-manager.c"
-	}
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return NULL;
-#line 2507 "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 13 "/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 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return G_PARAM_SPEC (spec);
-#line 2521 "autosave-manager.c"
-}
-
-
-gpointer value_get_autosave_manager (const GValue* value) {
-#line 13 "/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 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return value->data[0].v_pointer;
-#line 2530 "autosave-manager.c"
-}
-
-
-void value_set_autosave_manager (GValue* value, gpointer v_object) {
-	AutosaveManager* old;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER));
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	old = value->data[0].v_pointer;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (v_object) {
-#line 13 "/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 13 "/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 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		value->data[0].v_pointer = v_object;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		autosave_manager_ref (value->data[0].v_pointer);
-#line 2550 "autosave-manager.c"
-	} else {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		value->data[0].v_pointer = NULL;
-#line 2554 "autosave-manager.c"
-	}
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (old) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		autosave_manager_unref (old);
-#line 2560 "autosave-manager.c"
-	}
-}
-
-
-void value_take_autosave_manager (GValue* value, gpointer v_object) {
-	AutosaveManager* old;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER));
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	old = value->data[0].v_pointer;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (v_object) {
-#line 13 "/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 13 "/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 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		value->data[0].v_pointer = v_object;
-#line 2579 "autosave-manager.c"
-	} else {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		value->data[0].v_pointer = NULL;
-#line 2583 "autosave-manager.c"
-	}
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (old) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		autosave_manager_unref (old);
-#line 2589 "autosave-manager.c"
-	}
-}
-
-
-static void autosave_manager_class_init (AutosaveManagerClass * klass) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_parent_class = g_type_class_peek_parent (klass);
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	((AutosaveManagerClass *) klass)->finalize = autosave_manager_finalize;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_type_class_add_private (klass, sizeof (AutosaveManagerPrivate));
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = g_get_user_cache_dir ();
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "autosaves", NULL);
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_AUTOSAVE_DIR = _tmp1_;
-#line 16 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = g_strdup ("autosave.book");
-#line 16 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_AUTOSAVE_FILENAME = _tmp2_;
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = autosave_manager_AUTOSAVE_DIR;
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = autosave_manager_AUTOSAVE_FILENAME;
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = g_build_filename (_tmp3_, _tmp4_, NULL);
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_AUTOSAVE_PATH = _tmp5_;
-#line 2625 "autosave-manager.c"
-}
-
-
-static void autosave_manager_instance_init (AutosaveManager * self) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv = AUTOSAVE_MANAGER_GET_PRIVATE (self);
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->update_timeout = (guint) 0;
-#line 23 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->book_ = NULL;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->ref_count = 1;
-#line 2638 "autosave-manager.c"
-}
-
-
-static void autosave_manager_finalize (AutosaveManager* obj) {
-	AutosaveManager * self;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AUTOSAVE_MANAGER, AutosaveManager);
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_handlers_destroy (self);
-#line 21 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_hash_table_unref0 (self->priv->page_filenames);
-#line 23 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_book_unref0 (self->priv->book_);
-#line 2652 "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 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return instance;
-#line 2677 "autosave-manager.c"
-}
-
-
-void autosave_manager_unref (gpointer instance) {
-	AutosaveManager* self;
-	self = instance;
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		AUTOSAVE_MANAGER_GET_CLASS (self)->finalize (self);
-#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 2690 "autosave-manager.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);
-}
-
-
-static gint _vala_array_length (gpointer array) {
-	int length;
-	length = 0;
-	if (array) {
-		while (((gpointer*) array)[length]) {
-			length++;
-		}
-	}
-	return length;
-}
-
-
-
diff --git a/src/book-view.c b/src/book-view.c
deleted file mode 100644
index 849d86d..0000000
--- a/src/book-view.c
+++ /dev/null
@@ -1,3894 +0,0 @@
-/* book-view.c generated by valac 0.34.6, the Vala compiler
- * generated from book-view.vala, do not modify */
-
-/*
- * Copyright (C) 2009-2015 Canonical Ltd.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 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.
- */
-/* FIXME: When scrolling, copy existing render sideways?*/
-/* FIXME: Only render pages that change and only the part that changed*/
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <cairo.h>
-#include <float.h>
-#include <math.h>
-
-
-#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))
-#define IS_BOOK_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_BOOK_VIEW))
-#define IS_BOOK_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_BOOK_VIEW))
-#define BOOK_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_BOOK_VIEW, BookViewClass))
-
-typedef struct _BookView BookView;
-typedef struct _BookViewClass BookViewClass;
-typedef struct _BookViewPrivate BookViewPrivate;
-
-#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 TYPE_PAGE_VIEW (page_view_get_type ())
-#define PAGE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_VIEW, PageView))
-#define PAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_VIEW, PageViewClass))
-#define IS_PAGE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_VIEW))
-#define IS_PAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_VIEW))
-#define PAGE_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_VIEW, PageViewClass))
-
-typedef struct _PageView PageView;
-typedef struct _PageViewClass PageViewClass;
-#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 _page_view_unref0(var) ((var == NULL) ? NULL : (var = (page_view_unref (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
-
-struct _BookView {
-	GtkBox parent_instance;
-	BookViewPrivate * priv;
-};
-
-struct _BookViewClass {
-	GtkBoxClass parent_class;
-};
-
-struct _BookViewPrivate {
-	Book* _book;
-	GHashTable* page_data;
-	gboolean need_layout;
-	gboolean laying_out;
-	gboolean show_selected_page;
-	PageView* selected_page_view;
-	GtkWidget* drawing_area;
-	GtkScrollbar* scroll;
-	GtkAdjustment* adjustment;
-	GdkCursorType cursor;
-};
-
-
-static gpointer book_view_parent_class = NULL;
-
-GType book_view_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;
-gpointer page_view_ref (gpointer instance);
-void page_view_unref (gpointer instance);
-GParamSpec* param_spec_page_view (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_page_view (GValue* value, gpointer v_object);
-void value_take_page_view (GValue* value, gpointer v_object);
-gpointer value_get_page_view (const GValue* value);
-GType page_view_get_type (void) G_GNUC_CONST;
-#define BOOK_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BOOK_VIEW, BookViewPrivate))
-enum  {
-	BOOK_VIEW_DUMMY_PROPERTY,
-	BOOK_VIEW_BOOK,
-	BOOK_VIEW_SELECTED_PAGE,
-	BOOK_VIEW_X_OFFSET
-};
-Book* book_view_get_book (BookView* self);
-static void book_view_add_cb (BookView* self, Book* book, Page* page);
-static void _book_view_add_cb_book_page_added (Book* _sender, Page* page, gpointer self);
-static void book_view_remove_cb (BookView* self, Book* book, Page* page);
-static void _book_view_remove_cb_book_page_removed (Book* _sender, Page* page, gpointer self);
-static void book_view_reorder_cb (BookView* self, Book* book);
-static void _book_view_reorder_cb_book_reordered (Book* _sender, gpointer self);
-static void book_view_clear_cb (BookView* self, Book* book);
-static void _book_view_clear_cb_book_cleared (Book* _sender, gpointer self);
-static gboolean book_view_configure_cb (BookView* self, GtkWidget* widget, GdkEventConfigure* event);
-static gboolean _book_view_configure_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self);
-static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* context);
-static gboolean _book_view_draw_cb_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self);
-static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEventMotion* event);
-static gboolean _book_view_motion_cb_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self);
-static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey* event);
-static gboolean _book_view_key_cb_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
-static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEventButton* event);
-static gboolean _book_view_button_cb_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-static gboolean _book_view_button_cb_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-static gboolean book_view_focus_cb (BookView* self, GtkWidget* widget, GdkEventFocus* event);
-static gboolean _book_view_focus_cb_gtk_widget_focus_in_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self);
-static gboolean _book_view_focus_cb_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self);
-static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment);
-static void _book_view_scroll_cb_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-BookView* book_view_new (Book* book);
-BookView* book_view_construct (GType object_type, Book* book);
-static void book_view_set_book (BookView* self, Book* value);
-guint book_get_n_pages (Book* self);
-Page* book_get_page (Book* self, gint page_number);
-void book_view_set_selected_page (BookView* self, Page* value);
-static void _page_unref0_ (gpointer var);
-static void _page_view_unref0_ (gpointer var);
-static PageView* book_view_get_nth_page (BookView* self, gint n);
-static PageView* book_view_get_next_page (BookView* self, PageView* page);
-Page* page_view_get_page (PageView* self);
-static PageView* book_view_get_prev_page (BookView* self, PageView* page);
-static void book_view_page_view_changed_cb (BookView* self, PageView* page);
-void book_view_redraw (BookView* self);
-static void book_view_page_view_size_changed_cb (BookView* self, PageView* page);
-PageView* page_view_new (Page* page);
-PageView* page_view_construct (GType object_type, Page* page);
-static void _book_view_page_view_changed_cb_page_view_changed (PageView* _sender, gpointer self);
-static void _book_view_page_view_size_changed_cb_page_view_size_changed (PageView* _sender, gpointer self);
-static void book_view_set_selected_page_view (BookView* self, PageView* page);
-void page_view_set_selected (PageView* self, gboolean value);
-static void book_view_show_page_view (BookView* self, PageView* page);
-gint page_view_get_x_offset (PageView* self);
-gint page_view_get_width (PageView* self);
-gint book_view_get_x_offset (BookView* self);
-void book_view_set_x_offset (BookView* self, gint value);
-static void book_view_select_page_view (BookView* self, PageView* page);
-Page* book_view_get_selected_page (BookView* self);
-static void book_view_layout_into (BookView* self, gint width, gint height, gint* book_width, gint* book_height);
-gint page_get_dpi (Page* self);
-gint page_get_width (Page* self);
-gint page_get_height (Page* self);
-void page_view_set_width (PageView* self, gint value);
-void page_view_set_height (PageView* self, gint value);
-gint page_view_get_height (PageView* self);
-void page_view_set_x_offset (PageView* self, gint value);
-void page_view_set_y_offset (PageView* self, gint value);
-static void book_view_layout (BookView* self);
-void page_view_render (PageView* self, cairo_t* context);
-gboolean page_view_get_selected (PageView* self);
-gint page_view_get_y_offset (PageView* self);
-static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_, gint* y_);
-void page_view_button_press (PageView* self, gint x, gint y);
-void page_view_button_release (PageView* self, gint x, gint y);
-static void book_view_set_cursor (BookView* self, GdkCursorType cursor);
-void page_view_motion (PageView* self, gint x, gint y);
-GdkCursorType page_view_get_cursor (PageView* self);
-void book_view_select_next_page (BookView* self);
-void book_view_select_prev_page (BookView* 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_view_finalize (GObject* obj);
-static void _vala_book_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_book_view_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-
-
-static void _book_view_add_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_add_cb ((BookView*) self, _sender, page);
-#line 210 "book-view.c"
-}
-
-
-static void _book_view_remove_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_remove_cb ((BookView*) self, _sender, page);
-#line 217 "book-view.c"
-}
-
-
-static void _book_view_reorder_cb_book_reordered (Book* _sender, gpointer self) {
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_reorder_cb ((BookView*) self, _sender);
-#line 224 "book-view.c"
-}
-
-
-static void _book_view_clear_cb_book_cleared (Book* _sender, gpointer self) {
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_clear_cb ((BookView*) self, _sender);
-#line 231 "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 ((BookView*) self, _sender, event);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 240 "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 ((BookView*) self, _sender, cr);
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 249 "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 ((BookView*) self, _sender, event);
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 258 "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 ((BookView*) self, _sender, event);
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 267 "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 ((BookView*) self, _sender, event);
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 276 "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 ((BookView*) self, _sender, event);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 285 "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 ((BookView*) self, _sender, event);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 294 "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 ((BookView*) self, _sender, event);
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 303 "book-view.c"
-}
-
-
-static void _book_view_scroll_cb_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_scroll_cb ((BookView*) self, _sender);
-#line 310 "book-view.c"
-}
-
-
-static void _page_unref0_ (gpointer var) {
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
-#line 317 "book-view.c"
-}
-
-
-static void _page_view_unref0_ (gpointer var) {
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	(var == NULL) ? NULL : (var = (page_view_unref (var), NULL));
-#line 324 "book-view.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 331 "book-view.c"
-}
-
-
-BookView* book_view_construct (GType object_type, Book* book) {
-	BookView * self = NULL;
-	Book* _tmp0_ = NULL;
-	Book* _tmp12_ = NULL;
-	Page* _tmp13_ = NULL;
-	Page* _tmp14_ = NULL;
-	Book* _tmp15_ = NULL;
-	Book* _tmp16_ = NULL;
-	Book* _tmp17_ = NULL;
-	Book* _tmp18_ = NULL;
-	GHashFunc _tmp19_ = NULL;
-	GEqualFunc _tmp20_ = NULL;
-	GHashTable* _tmp21_ = NULL;
-	GtkDrawingArea* _tmp22_ = NULL;
-	GtkWidget* _tmp23_ = NULL;
-	GtkWidget* _tmp24_ = NULL;
-	GtkWidget* _tmp25_ = NULL;
-	GtkWidget* _tmp26_ = NULL;
-	GtkScrollbar* _tmp27_ = NULL;
-	GtkScrollbar* _tmp28_ = NULL;
-	GtkAdjustment* _tmp29_ = NULL;
-	GtkAdjustment* _tmp30_ = NULL;
-	GtkAdjustment* _tmp31_ = NULL;
-	GtkScrollbar* _tmp32_ = NULL;
-	GtkWidget* _tmp33_ = NULL;
-	GtkWidget* _tmp34_ = NULL;
-	GtkWidget* _tmp35_ = NULL;
-	GtkWidget* _tmp36_ = NULL;
-	GtkWidget* _tmp37_ = NULL;
-	GtkWidget* _tmp38_ = NULL;
-	GtkWidget* _tmp39_ = NULL;
-	GtkWidget* _tmp40_ = NULL;
-	GtkAdjustment* _tmp41_ = NULL;
-	GtkWidget* _tmp42_ = NULL;
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (book != NULL, NULL);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self = (BookView*) g_object_new (object_type, "orientation", GTK_ORIENTATION_VERTICAL, NULL);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = book;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_book (self, _tmp0_);
-#line 377 "book-view.c"
-	{
-		gint i = 0;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 382 "book-view.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp1_ = TRUE;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 389 "book-view.c"
-				gint _tmp3_ = 0;
-				Book* _tmp4_ = NULL;
-				guint _tmp5_ = 0U;
-				guint _tmp6_ = 0U;
-				Page* page = NULL;
-				Book* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
-				Page* _tmp9_ = NULL;
-				Book* _tmp10_ = NULL;
-				Page* _tmp11_ = NULL;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp1_) {
-#line 402 "book-view.c"
-					gint _tmp2_ = 0;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp2_ = i;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp2_ + 1;
-#line 408 "book-view.c"
-				}
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp1_ = FALSE;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp3_ = i;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = book;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = book_get_n_pages (_tmp4_);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = _tmp5_;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp3_) < _tmp6_)) {
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 424 "book-view.c"
-				}
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = book;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = i;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = book_get_page (_tmp7_, _tmp8_);
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp9_;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = book;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = page;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				book_view_add_cb (self, _tmp10_, _tmp11_);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_unref0 (page);
-#line 442 "book-view.c"
-			}
-		}
-	}
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp12_ = book;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = book_get_page (_tmp12_, 0);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = _tmp13_;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_selected_page (self, _tmp14_);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_unref0 (_tmp14_);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp15_ = book;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_connect_object (_tmp15_, "page-added", (GCallback) _book_view_add_cb_book_page_added, self, 0);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp16_ = book;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_connect_object (_tmp16_, "page-removed", (GCallback) _book_view_remove_cb_book_page_removed, self, 0);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp17_ = book;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_connect_object (_tmp17_, "reordered", (GCallback) _book_view_reorder_cb_book_reordered, self, 0);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp18_ = book;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_connect_object (_tmp18_, "cleared", (GCallback) _book_view_clear_cb_book_cleared, self, 0);
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->need_layout = TRUE;
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp19_ = g_direct_hash;
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp20_ = g_direct_equal;
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _page_unref0_, _page_view_unref0_);
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_g_hash_table_unref0 (self->priv->page_data);
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->page_data = _tmp21_;
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->cursor = GDK_ARROW;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp22_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_ref_sink (_tmp22_);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_g_object_unref0 (self->priv->drawing_area);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->drawing_area = (GtkWidget*) _tmp22_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp23_ = self->priv->drawing_area;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_set_size_request (_tmp23_, 200, 100);
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp24_ = self->priv->drawing_area;
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_set (_tmp24_, "can-focus", TRUE, NULL);
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp25_ = self->priv->drawing_area;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_set_events (_tmp25_, ((((GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_FOCUS_CHANGE_MASK) | GDK_STRUCTURE_MASK) | GDK_SCROLL_MASK);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp26_ = self->priv->drawing_area;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_box_pack_start ((GtkBox*) self, _tmp26_, TRUE, TRUE, (guint) 0);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp27_ = (GtkScrollbar*) gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_ref_sink (_tmp27_);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_g_object_unref0 (self->priv->scroll);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->scroll = _tmp27_;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp28_ = self->priv->scroll;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp29_ = gtk_range_get_adjustment ((GtkRange*) _tmp28_);
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp30_ = _tmp29_;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_g_object_unref0 (self->priv->adjustment);
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->adjustment = _tmp31_;
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp32_ = self->priv->scroll;
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp32_, FALSE, TRUE, (guint) 0);
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp33_ = self->priv->drawing_area;
-#line 108 "/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 109 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp34_ = self->priv->drawing_area;
-#line 109 "/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 110 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp35_ = self->priv->drawing_area;
-#line 110 "/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 111 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp36_ = self->priv->drawing_area;
-#line 111 "/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 112 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp37_ = self->priv->drawing_area;
-#line 112 "/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 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp38_ = self->priv->drawing_area;
-#line 113 "/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 114 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp39_ = self->priv->drawing_area;
-#line 114 "/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 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp40_ = self->priv->drawing_area;
-#line 115 "/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 116 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp41_ = self->priv->adjustment;
-#line 116 "/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 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp42_ = self->priv->drawing_area;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_set_visible (_tmp42_, TRUE);
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return self;
-#line 576 "book-view.c"
-}
-
-
-BookView* book_view_new (Book* book) {
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return book_view_construct (TYPE_BOOK_VIEW, book);
-#line 583 "book-view.c"
-}
-
-
-static gpointer _page_view_ref0 (gpointer self) {
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return self ? page_view_ref (self) : NULL;
-#line 590 "book-view.c"
-}
-
-
-static PageView* book_view_get_nth_page (BookView* self, gint n) {
-	PageView* result = NULL;
-	Page* page = NULL;
-	Book* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	Page* _tmp2_ = NULL;
-	GHashTable* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	PageView* _tmp5_ = NULL;
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->_book;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = n;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = book_get_page (_tmp0_, _tmp1_);
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	page = _tmp2_;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = self->priv->page_data;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = g_hash_table_lookup (_tmp3_, page);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp5_ = _page_view_ref0 ((PageView*) _tmp4_);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = _tmp5_;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_unref0 (page);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 625 "book-view.c"
-}
-
-
-static PageView* book_view_get_next_page (BookView* self, PageView* page) {
-	PageView* result = NULL;
-	PageView* _tmp18_ = NULL;
-	PageView* _tmp19_ = NULL;
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (page != NULL, NULL);
-#line 637 "book-view.c"
-	{
-		gint i = 0;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 642 "book-view.c"
-		{
-			gboolean _tmp0_ = FALSE;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp0_ = TRUE;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 649 "book-view.c"
-				Page* p = NULL;
-				Book* _tmp2_ = NULL;
-				gint _tmp3_ = 0;
-				Page* _tmp4_ = NULL;
-				Page* _tmp5_ = NULL;
-				Page* _tmp6_ = NULL;
-				PageView* _tmp7_ = NULL;
-				Page* _tmp8_ = NULL;
-				Page* _tmp9_ = NULL;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp0_) {
-#line 661 "book-view.c"
-					gint _tmp1_ = 0;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp1_ = i;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp1_ + 1;
-#line 667 "book-view.c"
-				}
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp0_ = FALSE;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp2_ = self->priv->_book;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp3_ = i;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = book_get_page (_tmp2_, _tmp3_);
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				p = _tmp4_;
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = p;
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp5_ == NULL) {
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_page_unref0 (p);
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 687 "book-view.c"
-				}
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = p;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = page;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = page_view_get_page (_tmp7_);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = _tmp8_;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp6_ == _tmp9_) {
-#line 699 "book-view.c"
-					Book* _tmp10_ = NULL;
-					gint _tmp11_ = 0;
-					Page* _tmp12_ = NULL;
-					Page* _tmp13_ = NULL;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp10_ = self->priv->_book;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp11_ = i;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp12_ = book_get_page (_tmp10_, _tmp11_ + 1);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_page_unref0 (p);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					p = _tmp12_;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp13_ = p;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					if (_tmp13_ != NULL) {
-#line 718 "book-view.c"
-						GHashTable* _tmp14_ = NULL;
-						Page* _tmp15_ = NULL;
-						gconstpointer _tmp16_ = NULL;
-						PageView* _tmp17_ = NULL;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp14_ = self->priv->page_data;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp15_ = p;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp16_ = g_hash_table_lookup (_tmp14_, _tmp15_);
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp17_ = _page_view_ref0 ((PageView*) _tmp16_);
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						result = _tmp17_;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_page_unref0 (p);
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						return result;
-#line 737 "book-view.c"
-					}
-				}
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_unref0 (p);
-#line 742 "book-view.c"
-			}
-		}
-	}
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp18_ = page;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp19_ = _page_view_ref0 (_tmp18_);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = _tmp19_;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 754 "book-view.c"
-}
-
-
-static PageView* book_view_get_prev_page (BookView* self, PageView* page) {
-	PageView* result = NULL;
-	PageView* prev_page = NULL;
-	PageView* _tmp0_ = NULL;
-	PageView* _tmp1_ = NULL;
-	PageView* _tmp16_ = NULL;
-	PageView* _tmp17_ = NULL;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (page != NULL, NULL);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = page;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = _page_view_ref0 (_tmp0_);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	prev_page = _tmp1_;
-#line 775 "book-view.c"
-	{
-		gint i = 0;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 780 "book-view.c"
-		{
-			gboolean _tmp2_ = FALSE;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp2_ = TRUE;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 787 "book-view.c"
-				Page* p = NULL;
-				Book* _tmp4_ = NULL;
-				gint _tmp5_ = 0;
-				Page* _tmp6_ = NULL;
-				Page* _tmp7_ = NULL;
-				Page* _tmp8_ = NULL;
-				PageView* _tmp9_ = NULL;
-				Page* _tmp10_ = NULL;
-				Page* _tmp11_ = NULL;
-				GHashTable* _tmp12_ = NULL;
-				Page* _tmp13_ = NULL;
-				gconstpointer _tmp14_ = NULL;
-				PageView* _tmp15_ = NULL;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp2_) {
-#line 803 "book-view.c"
-					gint _tmp3_ = 0;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp3_ = i;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp3_ + 1;
-#line 809 "book-view.c"
-				}
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp2_ = FALSE;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = self->priv->_book;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = i;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = book_get_page (_tmp4_, _tmp5_);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				p = _tmp6_;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = p;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp7_ == NULL) {
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_page_unref0 (p);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 829 "book-view.c"
-				}
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = p;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = page;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = page_view_get_page (_tmp9_);
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = _tmp10_;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp8_ == _tmp11_) {
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					result = prev_page;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_page_unref0 (p);
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					return result;
-#line 847 "book-view.c"
-				}
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = self->priv->page_data;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = p;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp14_ = g_hash_table_lookup (_tmp12_, _tmp13_);
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = _page_view_ref0 ((PageView*) _tmp14_);
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_view_unref0 (prev_page);
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				prev_page = _tmp15_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_unref0 (p);
-#line 863 "book-view.c"
-			}
-		}
-	}
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp16_ = page;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp17_ = _page_view_ref0 (_tmp16_);
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = _tmp17_;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (prev_page);
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 877 "book-view.c"
-}
-
-
-static void book_view_page_view_changed_cb (BookView* self, PageView* page) {
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (page != NULL);
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_redraw (self);
-#line 888 "book-view.c"
-}
-
-
-static void book_view_page_view_size_changed_cb (BookView* self, PageView* page) {
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (page != NULL);
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->need_layout = TRUE;
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_redraw (self);
-#line 901 "book-view.c"
-}
-
-
-static void _book_view_page_view_changed_cb_page_view_changed (PageView* _sender, gpointer self) {
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_page_view_changed_cb ((BookView*) self, _sender);
-#line 908 "book-view.c"
-}
-
-
-static void _book_view_page_view_size_changed_cb_page_view_size_changed (PageView* _sender, gpointer self) {
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_page_view_size_changed_cb ((BookView*) self, _sender);
-#line 915 "book-view.c"
-}
-
-
-static gpointer _page_ref0 (gpointer self) {
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return self ? page_ref (self) : NULL;
-#line 922 "book-view.c"
-}
-
-
-static void book_view_add_cb (BookView* self, Book* book, Page* page) {
-	PageView* page_view = NULL;
-	Page* _tmp0_ = NULL;
-	PageView* _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	PageView* _tmp5_ = NULL;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (book != NULL);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (page != NULL);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = page;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = page_view_new (_tmp0_);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	page_view = _tmp1_;
-#line 192 "/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 193 "/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 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = self->priv->page_data;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = page;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = _page_ref0 (_tmp3_);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp5_ = _page_view_ref0 (page_view);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_hash_table_insert (_tmp2_, _tmp4_, _tmp5_);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->need_layout = TRUE;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_redraw (self);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (page_view);
-#line 966 "book-view.c"
-}
-
-
-static void book_view_set_selected_page_view (BookView* self, PageView* page) {
-	gboolean _tmp0_ = FALSE;
-	PageView* _tmp1_ = NULL;
-	PageView* _tmp5_ = NULL;
-	PageView* _tmp6_ = NULL;
-	PageView* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = self->priv->selected_page_view;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp1_ != NULL) {
-#line 985 "book-view.c"
-		PageView* _tmp2_ = NULL;
-		PageView* _tmp3_ = NULL;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp2_ = page;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp3_ = self->priv->selected_page_view;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp0_ = _tmp2_ != _tmp3_;
-#line 994 "book-view.c"
-	} else {
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp0_ = FALSE;
-#line 998 "book-view.c"
-	}
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp0_) {
-#line 1002 "book-view.c"
-		PageView* _tmp4_ = NULL;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp4_ = self->priv->selected_page_view;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_set_selected (_tmp4_, TRUE);
-#line 1008 "book-view.c"
-	}
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp5_ = page;
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp6_ = _page_view_ref0 (_tmp5_);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (self->priv->selected_page_view);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->selected_page_view = _tmp6_;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp7_ = self->priv->selected_page_view;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp7_ == NULL) {
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return;
-#line 1024 "book-view.c"
-	}
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp8_ = self->priv->drawing_area;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_get (_tmp8_, "has-focus", &_tmp9_, NULL);
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp10_ = _tmp9_;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (!_tmp10_) {
-#line 1034 "book-view.c"
-		PageView* _tmp11_ = NULL;
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp11_ = self->priv->selected_page_view;
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_set_selected (_tmp11_, FALSE);
-#line 1040 "book-view.c"
-	} else {
-		PageView* _tmp12_ = NULL;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp12_ = self->priv->selected_page_view;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_set_selected (_tmp12_, TRUE);
-#line 1047 "book-view.c"
-	}
-}
-
-
-static void book_view_show_page_view (BookView* self, PageView* page) {
-	gboolean _tmp0_ = FALSE;
-	PageView* _tmp1_ = NULL;
-	GtkAllocation allocation = {0};
-	GtkWidget* _tmp4_ = NULL;
-	GtkAllocation _tmp5_ = {0};
-	gint left_edge = 0;
-	PageView* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint right_edge = 0;
-	PageView* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	PageView* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = page;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp1_ == NULL) {
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp0_ = TRUE;
-#line 1080 "book-view.c"
-	} else {
-		GtkScrollbar* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp2_ = self->priv->scroll;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp3_ = gtk_widget_get_visible ((GtkWidget*) _tmp2_);
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp0_ = !_tmp3_;
-#line 1090 "book-view.c"
-	}
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp0_) {
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return;
-#line 1096 "book-view.c"
-	}
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = self->priv->drawing_area;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_get_allocation (_tmp4_, &_tmp5_);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	allocation = _tmp5_;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp6_ = page;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp7_ = page_view_get_x_offset (_tmp6_);
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp8_ = _tmp7_;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	left_edge = _tmp8_;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp9_ = page;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp10_ = page_view_get_x_offset (_tmp9_);
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp11_ = _tmp10_;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp12_ = page;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = page_view_get_width (_tmp12_);
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = _tmp13_;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	right_edge = _tmp11_ + _tmp14_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp15_ = left_edge;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp16_ = book_view_get_x_offset (self);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp17_ = _tmp16_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if ((_tmp15_ - _tmp17_) < 0) {
-#line 1134 "book-view.c"
-		gint _tmp18_ = 0;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp18_ = left_edge;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_set_x_offset (self, _tmp18_);
-#line 1140 "book-view.c"
-	} else {
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
-		GtkAllocation _tmp22_ = {0};
-		gint _tmp23_ = 0;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp19_ = right_edge;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp20_ = book_view_get_x_offset (self);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp21_ = _tmp20_;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp22_ = allocation;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp23_ = _tmp22_.width;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if ((_tmp19_ - _tmp21_) > _tmp23_) {
-#line 1159 "book-view.c"
-			gint _tmp24_ = 0;
-			GtkAllocation _tmp25_ = {0};
-			gint _tmp26_ = 0;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp24_ = right_edge;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp25_ = allocation;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp26_ = _tmp25_.width;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_set_x_offset (self, _tmp24_ - _tmp26_);
-#line 1171 "book-view.c"
-		}
-	}
-}
-
-
-static void book_view_select_page_view (BookView* self, PageView* page) {
-	Page* p = NULL;
-	PageView* _tmp0_ = NULL;
-	PageView* _tmp1_ = NULL;
-	PageView* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	PageView* _tmp5_ = NULL;
-	Page* _tmp10_ = NULL;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	p = NULL;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page_view;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = page;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp0_ == _tmp1_) {
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_page_unref0 (p);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return;
-#line 1199 "book-view.c"
-	}
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = page;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_selected_page_view (self, _tmp2_);
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = self->priv->need_layout;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp3_) {
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		self->priv->show_selected_page = TRUE;
-#line 1211 "book-view.c"
-	} else {
-		PageView* _tmp4_ = NULL;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp4_ = page;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_show_page_view (self, _tmp4_);
-#line 1218 "book-view.c"
-	}
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp5_ = page;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp5_ != NULL) {
-#line 1224 "book-view.c"
-		PageView* _tmp6_ = NULL;
-		Page* _tmp7_ = NULL;
-		Page* _tmp8_ = NULL;
-		Page* _tmp9_ = NULL;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp6_ = page;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp7_ = page_view_get_page (_tmp6_);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp8_ = _tmp7_;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp9_ = _page_ref0 (_tmp8_);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_page_unref0 (p);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		p = _tmp9_;
-#line 1241 "book-view.c"
-	}
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp10_ = p;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_emit_by_name (self, "page-selected", _tmp10_);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_unref0 (p);
-#line 1249 "book-view.c"
-}
-
-
-static void book_view_remove_cb (BookView* self, Book* book, Page* page) {
-	PageView* new_selection = NULL;
-	PageView* _tmp0_ = NULL;
-	PageView* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	PageView* page_view = NULL;
-	GHashTable* _tmp11_ = NULL;
-	Page* _tmp12_ = NULL;
-	gconstpointer _tmp13_ = NULL;
-	PageView* _tmp14_ = NULL;
-	guint _tmp15_ = 0U;
-	guint _tmp16_ = 0U;
-	GHashTable* _tmp17_ = NULL;
-	Page* _tmp18_ = NULL;
-	PageView* _tmp19_ = NULL;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (book != NULL);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (page != NULL);
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page_view;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = _page_view_ref0 (_tmp0_);
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	new_selection = _tmp1_;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = page;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = book_view_get_selected_page (self);
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = _tmp3_;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp2_ == _tmp4_) {
-#line 1290 "book-view.c"
-		PageView* _tmp5_ = NULL;
-		PageView* _tmp6_ = NULL;
-		PageView* _tmp7_ = NULL;
-		PageView* _tmp8_ = NULL;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp5_ = self->priv->selected_page_view;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp6_ = book_view_get_prev_page (self, _tmp5_);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_page_view_unref0 (new_selection);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		new_selection = _tmp6_;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp7_ = new_selection;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp8_ = self->priv->selected_page_view;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp7_ == _tmp8_) {
-#line 1309 "book-view.c"
-			PageView* _tmp9_ = NULL;
-			PageView* _tmp10_ = NULL;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp9_ = self->priv->selected_page_view;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp10_ = book_view_get_next_page (self, _tmp9_);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_page_view_unref0 (new_selection);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			new_selection = _tmp10_;
-#line 1320 "book-view.c"
-		}
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_page_view_unref0 (self->priv->selected_page_view);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		self->priv->selected_page_view = NULL;
-#line 1326 "book-view.c"
-	}
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp11_ = self->priv->page_data;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp12_ = page;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = g_hash_table_lookup (_tmp11_, _tmp12_);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = _page_view_ref0 ((PageView*) _tmp13_);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	page_view = _tmp14_;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("changed", TYPE_PAGE_VIEW, &_tmp15_, NULL, FALSE);
-#line 265 "/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, _tmp15_, 0, NULL, (GCallback) _book_view_page_view_changed_cb_page_view_changed, self);
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("size-changed", TYPE_PAGE_VIEW, &_tmp16_, NULL, FALSE);
-#line 266 "/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_size_changed_cb_page_view_size_changed, self);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp17_ = self->priv->page_data;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp18_ = page;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_hash_table_remove (_tmp17_, _tmp18_);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp19_ = new_selection;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_select_page_view (self, _tmp19_);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->need_layout = TRUE;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_redraw (self);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (page_view);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (new_selection);
-#line 1364 "book-view.c"
-}
-
-
-static void book_view_reorder_cb (BookView* self, Book* book) {
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (book != NULL);
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->need_layout = TRUE;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_redraw (self);
-#line 1377 "book-view.c"
-}
-
-
-static void book_view_clear_cb (BookView* self, Book* book) {
-	GHashTable* _tmp0_ = NULL;
-#line 281 "/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"
-	g_return_if_fail (book != NULL);
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->page_data;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_hash_table_remove_all (_tmp0_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (self->priv->selected_page_view);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->selected_page_view = NULL;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_emit_by_name (self, "page-selected", NULL);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->need_layout = TRUE;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_redraw (self);
-#line 1401 "book-view.c"
-}
-
-
-static gboolean book_view_configure_cb (BookView* self, GtkWidget* widget, GdkEventConfigure* event) {
-	gboolean result = FALSE;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->need_layout = TRUE;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = FALSE;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 1419 "book-view.c"
-}
-
-
-static void book_view_layout_into (BookView* self, gint width, gint height, gint* book_width, gint* book_height) {
-	gint _vala_book_width = 0;
-	gint _vala_book_height = 0;
-	gint max_dpi = 0;
-	gint max_width = 0;
-	gint max_height = 0;
-	gdouble aspect = 0.0;
-	gint _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	gdouble max_aspect = 0.0;
-	gint _tmp49_ = 0;
-	gint _tmp50_ = 0;
-	gint spacing = 0;
-	gint x_offset = 0;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	max_dpi = 0;
-#line 1441 "book-view.c"
-	{
-		gint i = 0;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 1446 "book-view.c"
-		{
-			gboolean _tmp0_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp0_ = TRUE;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 1453 "book-view.c"
-				gint _tmp2_ = 0;
-				Book* _tmp3_ = NULL;
-				guint _tmp4_ = 0U;
-				guint _tmp5_ = 0U;
-				Page* page = NULL;
-				Book* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				Page* _tmp8_ = NULL;
-				Page* _tmp9_ = NULL;
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
-				gint _tmp12_ = 0;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp0_) {
-#line 1468 "book-view.c"
-					gint _tmp1_ = 0;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp1_ = i;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp1_ + 1;
-#line 1474 "book-view.c"
-				}
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp0_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp2_ = i;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp3_ = self->priv->_book;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = book_get_n_pages (_tmp3_);
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = _tmp4_;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp2_) < _tmp5_)) {
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 1490 "book-view.c"
-				}
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = self->priv->_book;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = i;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = book_get_page (_tmp6_, _tmp7_);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp8_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = page;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = page_get_dpi (_tmp9_);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = _tmp10_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = max_dpi;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp11_ > _tmp12_) {
-#line 1510 "book-view.c"
-					Page* _tmp13_ = NULL;
-					gint _tmp14_ = 0;
-					gint _tmp15_ = 0;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp13_ = page;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp14_ = page_get_dpi (_tmp13_);
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp15_ = _tmp14_;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					max_dpi = _tmp15_;
-#line 1522 "book-view.c"
-				}
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_unref0 (page);
-#line 1526 "book-view.c"
-			}
-		}
-	}
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	max_width = 0;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	max_height = 0;
-#line 1534 "book-view.c"
-	{
-		gint i = 0;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 1539 "book-view.c"
-		{
-			gboolean _tmp16_ = FALSE;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp16_ = TRUE;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 1546 "book-view.c"
-				gint _tmp18_ = 0;
-				Book* _tmp19_ = NULL;
-				guint _tmp20_ = 0U;
-				guint _tmp21_ = 0U;
-				Page* page = NULL;
-				Book* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				Page* _tmp24_ = NULL;
-				gint w = 0;
-				Page* _tmp25_ = NULL;
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
-				gint h = 0;
-				Page* _tmp28_ = NULL;
-				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
-				gint _tmp32_ = 0;
-				Page* _tmp33_ = NULL;
-				gint _tmp34_ = 0;
-				gint _tmp35_ = 0;
-				gint _tmp36_ = 0;
-				gint _tmp37_ = 0;
-				Page* _tmp38_ = NULL;
-				gint _tmp39_ = 0;
-				gint _tmp40_ = 0;
-				gint _tmp41_ = 0;
-				gint _tmp42_ = 0;
-				gint _tmp44_ = 0;
-				gint _tmp45_ = 0;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp16_) {
-#line 1579 "book-view.c"
-					gint _tmp17_ = 0;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp17_ = i;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp17_ + 1;
-#line 1585 "book-view.c"
-				}
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp16_ = FALSE;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp18_ = i;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp19_ = self->priv->_book;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp20_ = book_get_n_pages (_tmp19_);
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp21_ = _tmp20_;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp18_) < _tmp21_)) {
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 1601 "book-view.c"
-				}
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp22_ = self->priv->_book;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp23_ = i;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp24_ = book_get_page (_tmp22_, _tmp23_);
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp24_;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp25_ = page;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = page_get_width (_tmp25_);
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp27_ = _tmp26_;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				w = _tmp27_;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp28_ = page;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp29_ = page_get_height (_tmp28_);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp30_ = _tmp29_;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				h = _tmp30_;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp31_ = w;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp32_ = max_dpi;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp33_ = page;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp34_ = page_get_dpi (_tmp33_);
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp35_ = _tmp34_;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				w = (gint) (((((gdouble) _tmp31_) * _tmp32_) / _tmp35_) + 0.5);
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp36_ = h;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp37_ = max_dpi;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp38_ = page;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp39_ = page_get_dpi (_tmp38_);
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp40_ = _tmp39_;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				h = (gint) (((((gdouble) _tmp36_) * _tmp37_) / _tmp40_) + 0.5);
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp41_ = w;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp42_ = max_width;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp41_ > _tmp42_) {
-#line 1657 "book-view.c"
-					gint _tmp43_ = 0;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp43_ = w;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					max_width = _tmp43_;
-#line 1663 "book-view.c"
-				}
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp44_ = h;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp45_ = max_height;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp44_ > _tmp45_) {
-#line 1671 "book-view.c"
-					gint _tmp46_ = 0;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp46_ = h;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					max_height = _tmp46_;
-#line 1677 "book-view.c"
-				}
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_unref0 (page);
-#line 1681 "book-view.c"
-			}
-		}
-	}
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp47_ = width;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp48_ = height;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	aspect = ((gdouble) _tmp47_) / _tmp48_;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp49_ = max_width;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp50_ = max_height;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	max_aspect = ((gdouble) _tmp49_) / _tmp50_;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	spacing = 12;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_vala_book_width = 0;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_vala_book_height = 0;
-#line 1703 "book-view.c"
-	{
-		gint i = 0;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 1708 "book-view.c"
-		{
-			gboolean _tmp51_ = FALSE;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp51_ = TRUE;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 1715 "book-view.c"
-				gint _tmp53_ = 0;
-				Book* _tmp54_ = NULL;
-				guint _tmp55_ = 0U;
-				guint _tmp56_ = 0U;
-				PageView* page = NULL;
-				gint _tmp57_ = 0;
-				PageView* _tmp58_ = NULL;
-				Page* p = NULL;
-				PageView* _tmp59_ = NULL;
-				Page* _tmp60_ = NULL;
-				Page* _tmp61_ = NULL;
-				Page* _tmp62_ = NULL;
-				gdouble _tmp63_ = 0.0;
-				gdouble _tmp64_ = 0.0;
-				gint h = 0;
-				PageView* _tmp87_ = NULL;
-				gint _tmp88_ = 0;
-				gint _tmp89_ = 0;
-				gint _tmp90_ = 0;
-				gint _tmp91_ = 0;
-				gint _tmp93_ = 0;
-				PageView* _tmp94_ = NULL;
-				gint _tmp95_ = 0;
-				gint _tmp96_ = 0;
-				gint _tmp97_ = 0;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp51_) {
-#line 1743 "book-view.c"
-					gint _tmp52_ = 0;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp52_ = i;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp52_ + 1;
-#line 1749 "book-view.c"
-				}
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp51_ = FALSE;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp53_ = i;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp54_ = self->priv->_book;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp55_ = book_get_n_pages (_tmp54_);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp56_ = _tmp55_;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp53_) < _tmp56_)) {
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 1765 "book-view.c"
-				}
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp57_ = i;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp58_ = book_view_get_nth_page (self, _tmp57_);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp58_;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp59_ = page;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp60_ = page_view_get_page (_tmp59_);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp61_ = _tmp60_;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp62_ = _page_ref0 (_tmp61_);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				p = _tmp62_;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp63_ = max_aspect;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp64_ = aspect;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp63_ > _tmp64_) {
-#line 1789 "book-view.c"
-					gint w = 0;
-					Page* _tmp65_ = NULL;
-					gint _tmp66_ = 0;
-					gint _tmp67_ = 0;
-					gint _tmp68_ = 0;
-					gint _tmp69_ = 0;
-					Page* _tmp70_ = NULL;
-					gint _tmp71_ = 0;
-					gint _tmp72_ = 0;
-					gint _tmp73_ = 0;
-					PageView* _tmp74_ = NULL;
-					gint _tmp75_ = 0;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp65_ = p;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp66_ = page_get_width (_tmp65_);
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp67_ = _tmp66_;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp68_ = max_dpi;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp69_ = width;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp70_ = p;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp71_ = page_get_dpi (_tmp70_);
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp72_ = _tmp71_;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp73_ = max_width;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					w = (gint) (((((gdouble) _tmp67_) * _tmp68_) * _tmp69_) / (_tmp72_ * _tmp73_));
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp74_ = page;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp75_ = w;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					page_view_set_width (_tmp74_, _tmp75_);
-#line 1828 "book-view.c"
-				} else {
-					gint h = 0;
-					Page* _tmp76_ = NULL;
-					gint _tmp77_ = 0;
-					gint _tmp78_ = 0;
-					gint _tmp79_ = 0;
-					gint _tmp80_ = 0;
-					Page* _tmp81_ = NULL;
-					gint _tmp82_ = 0;
-					gint _tmp83_ = 0;
-					gint _tmp84_ = 0;
-					PageView* _tmp85_ = NULL;
-					gint _tmp86_ = 0;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp76_ = p;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp77_ = page_get_height (_tmp76_);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp78_ = _tmp77_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp79_ = max_dpi;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp80_ = height;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp81_ = p;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp82_ = page_get_dpi (_tmp81_);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp83_ = _tmp82_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp84_ = max_height;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					h = (gint) (((((gdouble) _tmp78_) * _tmp79_) * _tmp80_) / (_tmp83_ * _tmp84_));
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp85_ = page;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp86_ = h;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					page_view_set_height (_tmp85_, _tmp86_);
-#line 1868 "book-view.c"
-				}
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp87_ = page;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp88_ = page_view_get_height (_tmp87_);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp89_ = _tmp88_;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				h = _tmp89_;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp90_ = h;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp91_ = _vala_book_height;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp90_ > _tmp91_) {
-#line 1884 "book-view.c"
-					gint _tmp92_ = 0;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp92_ = h;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_book_height = _tmp92_;
-#line 1890 "book-view.c"
-				}
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp93_ = _vala_book_width;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp94_ = page;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp95_ = page_view_get_width (_tmp94_);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp96_ = _tmp95_;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_vala_book_width = _tmp93_ + _tmp96_;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp97_ = i;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp97_ != 0) {
-#line 1906 "book-view.c"
-					gint _tmp98_ = 0;
-					gint _tmp99_ = 0;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp98_ = _vala_book_width;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp99_ = spacing;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_book_width = _tmp98_ + _tmp99_;
-#line 1915 "book-view.c"
-				}
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_unref0 (p);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_view_unref0 (page);
-#line 1921 "book-view.c"
-			}
-		}
-	}
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	x_offset = 0;
-#line 1927 "book-view.c"
-	{
-		gint i = 0;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 1932 "book-view.c"
-		{
-			gboolean _tmp100_ = FALSE;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp100_ = TRUE;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 1939 "book-view.c"
-				gint _tmp102_ = 0;
-				Book* _tmp103_ = NULL;
-				guint _tmp104_ = 0U;
-				guint _tmp105_ = 0U;
-				PageView* page = NULL;
-				gint _tmp106_ = 0;
-				PageView* _tmp107_ = NULL;
-				PageView* _tmp108_ = NULL;
-				gint _tmp109_ = 0;
-				gint _tmp110_ = 0;
-				PageView* _tmp111_ = NULL;
-				gint _tmp112_ = 0;
-				gint _tmp113_ = 0;
-				gint _tmp114_ = 0;
-				PageView* _tmp115_ = NULL;
-				gint _tmp116_ = 0;
-				PageView* _tmp117_ = NULL;
-				gint _tmp118_ = 0;
-				gint _tmp119_ = 0;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp100_) {
-#line 1961 "book-view.c"
-					gint _tmp101_ = 0;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp101_ = i;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp101_ + 1;
-#line 1967 "book-view.c"
-				}
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp100_ = FALSE;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp102_ = i;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp103_ = self->priv->_book;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp104_ = book_get_n_pages (_tmp103_);
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp105_ = _tmp104_;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp102_) < _tmp105_)) {
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 1983 "book-view.c"
-				}
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp106_ = i;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp107_ = book_view_get_nth_page (self, _tmp106_);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp107_;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp108_ = page;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp109_ = x_offset;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_set_x_offset (_tmp108_, _tmp109_);
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp110_ = x_offset;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp111_ = page;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp112_ = page_view_get_width (_tmp111_);
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp113_ = _tmp112_;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp114_ = spacing;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				x_offset = _tmp110_ + (_tmp113_ + _tmp114_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp115_ = page;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp116_ = height;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp117_ = page;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp118_ = page_view_get_height (_tmp117_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp119_ = _tmp118_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_set_y_offset (_tmp115_, (_tmp116_ - _tmp119_) / 2);
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_view_unref0 (page);
-#line 2023 "book-view.c"
-			}
-		}
-	}
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (book_width) {
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		*book_width = _vala_book_width;
-#line 2031 "book-view.c"
-	}
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (book_height) {
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		*book_height = _vala_book_height;
-#line 2037 "book-view.c"
-	}
-}
-
-
-static void book_view_layout (BookView* self) {
-	gboolean _tmp0_ = FALSE;
-	GtkAllocation allocation = {0};
-	GtkWidget* _tmp1_ = NULL;
-	GtkAllocation _tmp2_ = {0};
-	GtkAllocation box_allocation = {0};
-	GtkAllocation _tmp3_ = {0};
-	gboolean right_aligned = FALSE;
-	GtkAdjustment* _tmp4_ = NULL;
-	gdouble _tmp5_ = 0.0;
-	GtkAdjustment* _tmp6_ = NULL;
-	gdouble _tmp7_ = 0.0;
-	GtkAdjustment* _tmp8_ = NULL;
-	gdouble _tmp9_ = 0.0;
-	gint width = 0;
-	GtkAllocation _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	gint height = 0;
-	GtkAllocation _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	guint _tmp14_ = 0U;
-	gint book_width = 0;
-	gint book_height = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	GtkAllocation _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	gboolean _tmp54_ = FALSE;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->need_layout;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (!_tmp0_) {
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return;
-#line 2081 "book-view.c"
-	}
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->laying_out = TRUE;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = self->priv->drawing_area;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_get_allocation (_tmp1_, &_tmp2_);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	allocation = _tmp2_;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_get_allocation ((GtkWidget*) self, &_tmp3_);
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	box_allocation = _tmp3_;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	right_aligned = TRUE;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = self->priv->adjustment;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp5_ = gtk_adjustment_get_value (_tmp4_);
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp6_ = self->priv->adjustment;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp7_ = gtk_adjustment_get_upper (_tmp6_);
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp8_ = self->priv->adjustment;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp9_ = gtk_adjustment_get_page_size (_tmp8_);
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp5_ < (_tmp7_ - _tmp9_)) {
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		right_aligned = FALSE;
-#line 2113 "book-view.c"
-	}
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp10_ = allocation;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp11_ = _tmp10_.width;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	width = (gint) _tmp11_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp12_ = box_allocation;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = _tmp12_.height;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = gtk_container_get_border_width ((GtkContainer*) self);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	height = (gint) (_tmp13_ - (_tmp14_ * 2));
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp15_ = width;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp16_ = height;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_layout_into (self, _tmp15_, _tmp16_, &_tmp17_, &_tmp18_);
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_width = _tmp17_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_height = _tmp18_;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp19_ = book_width;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp20_ = allocation;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp21_ = _tmp20_.width;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp19_ > _tmp21_) {
-#line 2147 "book-view.c"
-		GtkAllocation _tmp22_ = {0};
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
-		gint _tmp27_ = 0;
-		GtkAdjustment* _tmp28_ = NULL;
-		GtkAdjustment* _tmp29_ = NULL;
-		gint _tmp30_ = 0;
-		GtkAdjustment* _tmp31_ = NULL;
-		GtkAllocation _tmp32_ = {0};
-		gint _tmp33_ = 0;
-		gint max_offset = 0;
-		gint _tmp34_ = 0;
-		GtkAllocation _tmp35_ = {0};
-		gint _tmp36_ = 0;
-		gboolean _tmp37_ = FALSE;
-		gboolean _tmp38_ = FALSE;
-		GtkScrollbar* _tmp43_ = NULL;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp22_ = allocation;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp23_ = _tmp22_.height;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		height = _tmp23_;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp24_ = width;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp25_ = height;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_layout_into (self, _tmp24_, _tmp25_, &_tmp26_, &_tmp27_);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_width = _tmp26_;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_height = _tmp27_;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp28_ = self->priv->adjustment;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_lower (_tmp28_, (gdouble) 0);
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp29_ = self->priv->adjustment;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp30_ = book_width;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_upper (_tmp29_, (gdouble) _tmp30_);
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp31_ = self->priv->adjustment;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp32_ = allocation;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp33_ = _tmp32_.width;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_page_size (_tmp31_, (gdouble) _tmp33_);
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp34_ = book_width;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp35_ = allocation;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp36_ = _tmp35_.width;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		max_offset = _tmp34_ - _tmp36_;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp38_ = right_aligned;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp38_) {
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp37_ = TRUE;
-#line 2215 "book-view.c"
-		} else {
-			gint _tmp39_ = 0;
-			gint _tmp40_ = 0;
-			gint _tmp41_ = 0;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp39_ = book_view_get_x_offset (self);
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp40_ = _tmp39_;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp41_ = max_offset;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp37_ = _tmp40_ > _tmp41_;
-#line 2228 "book-view.c"
-		}
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp37_) {
-#line 2232 "book-view.c"
-			gint _tmp42_ = 0;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp42_ = max_offset;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_set_x_offset (self, _tmp42_);
-#line 2238 "book-view.c"
-		}
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp43_ = self->priv->scroll;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp43_, TRUE);
-#line 2244 "book-view.c"
-	} else {
-		GtkScrollbar* _tmp44_ = NULL;
-		gint offset = 0;
-		gint _tmp45_ = 0;
-		GtkAllocation _tmp46_ = {0};
-		gint _tmp47_ = 0;
-		GtkAdjustment* _tmp48_ = NULL;
-		gint _tmp49_ = 0;
-		GtkAdjustment* _tmp50_ = NULL;
-		gint _tmp51_ = 0;
-		GtkAdjustment* _tmp52_ = NULL;
-		gint _tmp53_ = 0;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp44_ = self->priv->scroll;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp44_, FALSE);
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp45_ = book_width;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp46_ = allocation;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp47_ = _tmp46_.width;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		offset = (_tmp45_ - _tmp47_) / 2;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp48_ = self->priv->adjustment;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp49_ = offset;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_lower (_tmp48_, (gdouble) _tmp49_);
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp50_ = self->priv->adjustment;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp51_ = offset;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_upper (_tmp50_, (gdouble) _tmp51_);
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp52_ = self->priv->adjustment;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_page_size (_tmp52_, (gdouble) 0);
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp53_ = offset;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_set_x_offset (self, _tmp53_);
-#line 2289 "book-view.c"
-	}
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp54_ = self->priv->show_selected_page;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp54_) {
-#line 2295 "book-view.c"
-		PageView* _tmp55_ = NULL;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp55_ = self->priv->selected_page_view;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_show_page_view (self, _tmp55_);
-#line 2301 "book-view.c"
-	}
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->need_layout = FALSE;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->show_selected_page = FALSE;
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->laying_out = FALSE;
-#line 2309 "book-view.c"
-}
-
-
-static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* context) {
-	gboolean result = FALSE;
-	Book* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	guint _tmp2_ = 0U;
-	gdouble left = 0.0;
-	gdouble top = 0.0;
-	gdouble right = 0.0;
-	gdouble bottom = 0.0;
-	cairo_t* _tmp3_ = NULL;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (context != NULL, FALSE);
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->_book;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = book_get_n_pages (_tmp0_);
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = _tmp1_;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp2_ == ((guint) 0)) {
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		result = FALSE;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return result;
-#line 2345 "book-view.c"
-	}
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_layout (self);
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = context;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	cairo_clip_extents (_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	left = _tmp4_;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	top = _tmp5_;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	right = _tmp6_;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	bottom = _tmp7_;
-#line 2361 "book-view.c"
-	{
-		gint i = 0;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 2366 "book-view.c"
-		{
-			gboolean _tmp8_ = FALSE;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp8_ = TRUE;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 2373 "book-view.c"
-				gint _tmp10_ = 0;
-				Book* _tmp11_ = NULL;
-				guint _tmp12_ = 0U;
-				guint _tmp13_ = 0U;
-				PageView* page = NULL;
-				gint _tmp14_ = 0;
-				PageView* _tmp15_ = NULL;
-				gint left_edge = 0;
-				PageView* _tmp16_ = NULL;
-				gint _tmp17_ = 0;
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
-				gint right_edge = 0;
-				PageView* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
-				gint _tmp23_ = 0;
-				PageView* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
-				gint _tmp28_ = 0;
-				gboolean _tmp29_ = FALSE;
-				gint _tmp30_ = 0;
-				gdouble _tmp31_ = 0.0;
-				cairo_t* _tmp34_ = NULL;
-				cairo_t* _tmp35_ = NULL;
-				gint _tmp36_ = 0;
-				gint _tmp37_ = 0;
-				PageView* _tmp38_ = NULL;
-				cairo_t* _tmp39_ = NULL;
-				cairo_t* _tmp40_ = NULL;
-				PageView* _tmp41_ = NULL;
-				gboolean _tmp42_ = FALSE;
-				gboolean _tmp43_ = FALSE;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp8_) {
-#line 2411 "book-view.c"
-					gint _tmp9_ = 0;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp9_ = i;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp9_ + 1;
-#line 2417 "book-view.c"
-				}
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = FALSE;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = i;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = self->priv->_book;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = book_get_n_pages (_tmp11_);
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = _tmp12_;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp10_) < _tmp13_)) {
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 2433 "book-view.c"
-				}
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp14_ = i;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = book_view_get_nth_page (self, _tmp14_);
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp15_;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp16_ = page;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp17_ = page_view_get_x_offset (_tmp16_);
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp18_ = _tmp17_;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp19_ = book_view_get_x_offset (self);
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp20_ = _tmp19_;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				left_edge = _tmp18_ - _tmp20_;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp21_ = page;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp22_ = page_view_get_x_offset (_tmp21_);
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp23_ = _tmp22_;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp24_ = page;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp25_ = page_view_get_width (_tmp24_);
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = _tmp25_;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp27_ = book_view_get_x_offset (self);
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp28_ = _tmp27_;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				right_edge = (_tmp23_ + _tmp26_) - _tmp28_;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp30_ = right_edge;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp31_ = left;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (((gdouble) _tmp30_) < _tmp31_) {
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp29_ = TRUE;
-#line 2479 "book-view.c"
-				} else {
-					gint _tmp32_ = 0;
-					gdouble _tmp33_ = 0.0;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp32_ = left_edge;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp33_ = right;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp29_ = ((gdouble) _tmp32_) > _tmp33_;
-#line 2489 "book-view.c"
-				}
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp29_) {
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_page_view_unref0 (page);
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					continue;
-#line 2497 "book-view.c"
-				}
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp34_ = context;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				cairo_save (_tmp34_);
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp35_ = context;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp36_ = book_view_get_x_offset (self);
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp37_ = _tmp36_;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				cairo_translate (_tmp35_, (gdouble) (-_tmp37_), (gdouble) 0);
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp38_ = page;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp39_ = context;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_render (_tmp38_, _tmp39_);
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp40_ = context;
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				cairo_restore (_tmp40_);
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp41_ = page;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp42_ = page_view_get_selected (_tmp41_);
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp43_ = _tmp42_;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp43_) {
-#line 2529 "book-view.c"
-					GtkWidget* _tmp44_ = NULL;
-					GtkStyleContext* _tmp45_ = NULL;
-					cairo_t* _tmp46_ = NULL;
-					PageView* _tmp47_ = NULL;
-					gint _tmp48_ = 0;
-					gint _tmp49_ = 0;
-					gint _tmp50_ = 0;
-					gint _tmp51_ = 0;
-					PageView* _tmp52_ = NULL;
-					gint _tmp53_ = 0;
-					gint _tmp54_ = 0;
-					PageView* _tmp55_ = NULL;
-					gint _tmp56_ = 0;
-					gint _tmp57_ = 0;
-					PageView* _tmp58_ = NULL;
-					gint _tmp59_ = 0;
-					gint _tmp60_ = 0;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp44_ = self->priv->drawing_area;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp45_ = gtk_widget_get_style_context (_tmp44_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp46_ = context;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp47_ = page;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp48_ = page_view_get_x_offset (_tmp47_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp49_ = _tmp48_;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp50_ = book_view_get_x_offset (self);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp51_ = _tmp50_;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp52_ = page;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp53_ = page_view_get_y_offset (_tmp52_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp54_ = _tmp53_;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp55_ = page;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp56_ = page_view_get_width (_tmp55_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp57_ = _tmp56_;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp58_ = page;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp59_ = page_view_get_height (_tmp58_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp60_ = _tmp59_;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					gtk_render_focus (_tmp45_, _tmp46_, (gdouble) (_tmp49_ - _tmp51_), (gdouble) _tmp54_, (gdouble) _tmp57_, (gdouble) _tmp60_);
-#line 2583 "book-view.c"
-				}
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_view_unref0 (page);
-#line 2587 "book-view.c"
-			}
-		}
-	}
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = FALSE;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 2595 "book-view.c"
-}
-
-
-static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_, gint* y_) {
-	gint _vala_x_ = 0;
-	gint _vala_y_ = 0;
-	PageView* result = NULL;
-	gint _tmp0_ = 0;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_vala_y_ = 0;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = _vala_y_;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_vala_x_ = _tmp0_;
-#line 2612 "book-view.c"
-	{
-		gint i = 0;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 2617 "book-view.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp1_ = TRUE;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 2624 "book-view.c"
-				gint _tmp3_ = 0;
-				Book* _tmp4_ = NULL;
-				guint _tmp5_ = 0U;
-				guint _tmp6_ = 0U;
-				PageView* page = NULL;
-				gint _tmp7_ = 0;
-				PageView* _tmp8_ = NULL;
-				gint left = 0;
-				PageView* _tmp9_ = NULL;
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
-				gint right = 0;
-				gint _tmp12_ = 0;
-				PageView* _tmp13_ = NULL;
-				gint _tmp14_ = 0;
-				gint _tmp15_ = 0;
-				gint top = 0;
-				PageView* _tmp16_ = NULL;
-				gint _tmp17_ = 0;
-				gint _tmp18_ = 0;
-				gint bottom = 0;
-				gint _tmp19_ = 0;
-				PageView* _tmp20_ = NULL;
-				gint _tmp21_ = 0;
-				gint _tmp22_ = 0;
-				gboolean _tmp23_ = FALSE;
-				gboolean _tmp24_ = FALSE;
-				gboolean _tmp25_ = FALSE;
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp1_) {
-#line 2657 "book-view.c"
-					gint _tmp2_ = 0;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp2_ = i;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp2_ + 1;
-#line 2663 "book-view.c"
-				}
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp1_ = FALSE;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp3_ = i;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = self->priv->_book;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = book_get_n_pages (_tmp4_);
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = _tmp5_;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp3_) < _tmp6_)) {
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 2679 "book-view.c"
-				}
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = i;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = book_view_get_nth_page (self, _tmp7_);
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp8_;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = page;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = page_view_get_x_offset (_tmp9_);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = _tmp10_;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				left = _tmp11_;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = left;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = page;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp14_ = page_view_get_width (_tmp13_);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = _tmp14_;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				right = _tmp12_ + _tmp15_;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp16_ = page;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp17_ = page_view_get_y_offset (_tmp16_);
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp18_ = _tmp17_;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				top = _tmp18_;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp19_ = top;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp20_ = page;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp21_ = page_view_get_height (_tmp20_);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp22_ = _tmp21_;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				bottom = _tmp19_ + _tmp22_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = x;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp27_ = left;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp26_ >= _tmp27_) {
-#line 2729 "book-view.c"
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp28_ = x;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp29_ = right;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp25_ = _tmp28_ <= _tmp29_;
-#line 2738 "book-view.c"
-				} else {
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp25_ = FALSE;
-#line 2742 "book-view.c"
-				}
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp25_) {
-#line 2746 "book-view.c"
-					gint _tmp30_ = 0;
-					gint _tmp31_ = 0;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp30_ = y;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp31_ = top;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp24_ = _tmp30_ >= _tmp31_;
-#line 2755 "book-view.c"
-				} else {
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp24_ = FALSE;
-#line 2759 "book-view.c"
-				}
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp24_) {
-#line 2763 "book-view.c"
-					gint _tmp32_ = 0;
-					gint _tmp33_ = 0;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp32_ = y;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp33_ = bottom;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp23_ = _tmp32_ <= _tmp33_;
-#line 2772 "book-view.c"
-				} else {
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp23_ = FALSE;
-#line 2776 "book-view.c"
-				}
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp23_) {
-#line 2780 "book-view.c"
-					gint _tmp34_ = 0;
-					gint _tmp35_ = 0;
-					gint _tmp36_ = 0;
-					gint _tmp37_ = 0;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp34_ = x;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp35_ = left;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_x_ = _tmp34_ - _tmp35_;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp36_ = y;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp37_ = top;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_y_ = _tmp36_ - _tmp37_;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					result = page;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					if (x_) {
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						*x_ = _vala_x_;
-#line 2803 "book-view.c"
-					}
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					if (y_) {
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						*y_ = _vala_y_;
-#line 2809 "book-view.c"
-					}
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					return result;
-#line 2813 "book-view.c"
-				}
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_view_unref0 (page);
-#line 2817 "book-view.c"
-			}
-		}
-	}
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = NULL;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (x_) {
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		*x_ = _vala_x_;
-#line 2827 "book-view.c"
-	}
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (y_) {
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		*y_ = _vala_y_;
-#line 2833 "book-view.c"
-	}
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 2837 "book-view.c"
-}
-
-
-static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEventButton* event) {
-	gboolean result = FALSE;
-	GtkWidget* _tmp0_ = NULL;
-	gint x = 0;
-	gint y = 0;
-	GdkEventButton* _tmp1_ = NULL;
-	GdkEventType _tmp2_ = 0;
-	PageView* _tmp13_ = NULL;
-	GdkEventButton* _tmp14_ = NULL;
-	guint _tmp15_ = 0U;
-	GdkEventButton* _tmp30_ = NULL;
-	guint _tmp31_ = 0U;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_layout (self);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->drawing_area;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_grab_focus (_tmp0_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	x = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	y = 0;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = event;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = _tmp1_->type;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp2_ == GDK_BUTTON_PRESS) {
-#line 2875 "book-view.c"
-		GdkEventButton* _tmp3_ = NULL;
-		gdouble _tmp4_ = 0.0;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		GdkEventButton* _tmp7_ = NULL;
-		gdouble _tmp8_ = 0.0;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		PageView* _tmp11_ = NULL;
-		PageView* _tmp12_ = NULL;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp3_ = event;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp4_ = _tmp3_->x;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp5_ = book_view_get_x_offset (self);
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp6_ = _tmp5_;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp7_ = event;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp8_ = _tmp7_->y;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp11_ = book_view_get_page_at (self, (gint) (_tmp4_ + _tmp6_), (gint) _tmp8_, &_tmp9_, &_tmp10_);
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		x = _tmp9_;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		y = _tmp10_;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp12_ = _tmp11_;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_select_page_view (self, _tmp12_);
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_page_view_unref0 (_tmp12_);
-#line 2910 "book-view.c"
-	}
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = self->priv->selected_page_view;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp13_ == NULL) {
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		result = FALSE;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return result;
-#line 2920 "book-view.c"
-	}
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = event;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp15_ = _tmp14_->button;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp15_ == ((guint) 1)) {
-#line 2928 "book-view.c"
-		GdkEventButton* _tmp16_ = NULL;
-		GdkEventType _tmp17_ = 0;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp16_ = event;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp17_ = _tmp16_->type;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp17_ == GDK_BUTTON_PRESS) {
-#line 2937 "book-view.c"
-			PageView* _tmp18_ = NULL;
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp18_ = self->priv->selected_page_view;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp19_ = x;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp20_ = y;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			page_view_button_press (_tmp18_, _tmp19_, _tmp20_);
-#line 2949 "book-view.c"
-		} else {
-			GdkEventButton* _tmp21_ = NULL;
-			GdkEventType _tmp22_ = 0;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp21_ = event;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp22_ = _tmp21_->type;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			if (_tmp22_ == GDK_BUTTON_RELEASE) {
-#line 2959 "book-view.c"
-				PageView* _tmp23_ = NULL;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp23_ = self->priv->selected_page_view;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp24_ = x;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp25_ = y;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_button_release (_tmp23_, _tmp24_, _tmp25_);
-#line 2971 "book-view.c"
-			} else {
-				GdkEventButton* _tmp26_ = NULL;
-				GdkEventType _tmp27_ = 0;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = event;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp27_ = _tmp26_->type;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp27_ == GDK_2BUTTON_PRESS) {
-#line 2981 "book-view.c"
-					Page* _tmp28_ = NULL;
-					Page* _tmp29_ = NULL;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp28_ = book_view_get_selected_page (self);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp29_ = _tmp28_;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					g_signal_emit_by_name (self, "show-page", _tmp29_);
-#line 2990 "book-view.c"
-				}
-			}
-		}
-	}
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp30_ = event;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp31_ = _tmp30_->button;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp31_ == ((guint) 3)) {
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		g_signal_emit_by_name (self, "show-menu");
-#line 3003 "book-view.c"
-	}
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = FALSE;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 3009 "book-view.c"
-}
-
-
-static void book_view_set_cursor (BookView* self, GdkCursorType cursor) {
-	GdkCursor* c = NULL;
-	GdkCursorType _tmp0_ = 0;
-	GdkCursorType _tmp1_ = 0;
-	GdkCursorType _tmp2_ = 0;
-	GdkDisplay* _tmp3_ = NULL;
-	GdkCursorType _tmp4_ = 0;
-	GdkCursor* _tmp5_ = NULL;
-	GtkWidget* _tmp6_ = NULL;
-	GdkWindow* _tmp7_ = NULL;
-	GdkCursor* _tmp8_ = NULL;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->cursor;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = cursor;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp0_ == _tmp1_) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_g_object_unref0 (c);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return;
-#line 3036 "book-view.c"
-	}
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = cursor;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->cursor = _tmp2_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = gtk_widget_get_display ((GtkWidget*) self);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = cursor;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp5_ = gdk_cursor_new_for_display (_tmp3_, _tmp4_);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_g_object_unref0 (c);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	c = _tmp5_;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp6_ = self->priv->drawing_area;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp7_ = gtk_widget_get_window (_tmp6_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp8_ = c;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gdk_window_set_cursor (_tmp7_, _tmp8_);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_g_object_unref0 (c);
-#line 3062 "book-view.c"
-}
-
-
-static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEventMotion* event) {
-	gboolean result = FALSE;
-	GdkCursorType cursor = 0;
-	gboolean _tmp0_ = FALSE;
-	PageView* _tmp1_ = NULL;
-	GdkCursorType _tmp38_ = 0;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	cursor = GDK_ARROW;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = self->priv->selected_page_view;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp1_ != NULL) {
-#line 3084 "book-view.c"
-		GdkEventMotion* _tmp2_ = NULL;
-		GdkModifierType _tmp3_ = 0;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp2_ = event;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp3_ = _tmp2_->state;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp0_ = (_tmp3_ & GDK_BUTTON1_MASK) != 0;
-#line 3093 "book-view.c"
-	} else {
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp0_ = FALSE;
-#line 3097 "book-view.c"
-	}
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp0_) {
-#line 3101 "book-view.c"
-		gint x = 0;
-		GdkEventMotion* _tmp4_ = NULL;
-		gdouble _tmp5_ = 0.0;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		PageView* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gint y = 0;
-		GdkEventMotion* _tmp11_ = NULL;
-		gdouble _tmp12_ = 0.0;
-		PageView* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		PageView* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-		PageView* _tmp19_ = NULL;
-		GdkCursorType _tmp20_ = 0;
-		GdkCursorType _tmp21_ = 0;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp4_ = event;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp5_ = _tmp4_->x;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp6_ = book_view_get_x_offset (self);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp7_ = _tmp6_;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp8_ = self->priv->selected_page_view;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp9_ = page_view_get_x_offset (_tmp8_);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp10_ = _tmp9_;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		x = (gint) ((_tmp5_ + _tmp7_) - _tmp10_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp11_ = event;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp12_ = _tmp11_->y;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp13_ = self->priv->selected_page_view;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp14_ = page_view_get_y_offset (_tmp13_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp15_ = _tmp14_;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		y = (gint) (_tmp12_ - _tmp15_);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp16_ = self->priv->selected_page_view;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp17_ = x;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp18_ = y;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_motion (_tmp16_, _tmp17_, _tmp18_);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp19_ = self->priv->selected_page_view;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp20_ = page_view_get_cursor (_tmp19_);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp21_ = _tmp20_;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		cursor = _tmp21_;
-#line 3166 "book-view.c"
-	} else {
-		gint x = 0;
-		gint y = 0;
-		PageView* over_page = NULL;
-		GdkEventMotion* _tmp22_ = NULL;
-		gdouble _tmp23_ = 0.0;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
-		GdkEventMotion* _tmp26_ = NULL;
-		gdouble _tmp27_ = 0.0;
-		gint _tmp28_ = 0;
-		gint _tmp29_ = 0;
-		PageView* _tmp30_ = NULL;
-		PageView* _tmp31_ = NULL;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp22_ = event;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp23_ = _tmp22_->x;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp24_ = book_view_get_x_offset (self);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp25_ = _tmp24_;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp26_ = event;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp27_ = _tmp26_->y;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp30_ = book_view_get_page_at (self, (gint) (_tmp23_ + _tmp25_), (gint) _tmp27_, &_tmp28_, &_tmp29_);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		x = _tmp28_;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		y = _tmp29_;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		over_page = _tmp30_;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp31_ = over_page;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp31_ != NULL) {
-#line 3205 "book-view.c"
-			PageView* _tmp32_ = NULL;
-			gint _tmp33_ = 0;
-			gint _tmp34_ = 0;
-			PageView* _tmp35_ = NULL;
-			GdkCursorType _tmp36_ = 0;
-			GdkCursorType _tmp37_ = 0;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp32_ = over_page;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp33_ = x;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp34_ = y;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			page_view_motion (_tmp32_, _tmp33_, _tmp34_);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp35_ = over_page;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp36_ = page_view_get_cursor (_tmp35_);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp37_ = _tmp36_;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			cursor = _tmp37_;
-#line 3228 "book-view.c"
-		}
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_page_view_unref0 (over_page);
-#line 3232 "book-view.c"
-	}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp38_ = cursor;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_cursor (self, _tmp38_);
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = FALSE;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 3242 "book-view.c"
-}
-
-
-static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey* event) {
-	gboolean result = FALSE;
-	GdkEventKey* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = event;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = _tmp0_->keyval;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	switch (_tmp1_) {
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case 0xff50:
-#line 3264 "book-view.c"
-		{
-			Book* _tmp2_ = NULL;
-			Page* _tmp3_ = NULL;
-			Page* _tmp4_ = NULL;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp2_ = self->priv->_book;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp3_ = book_get_page (_tmp2_, 0);
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp4_ = _tmp3_;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_set_selected_page (self, _tmp4_);
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_page_unref0 (_tmp4_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			result = TRUE;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			return result;
-#line 3283 "book-view.c"
-		}
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case 0xff51:
-#line 3287 "book-view.c"
-		{
-			PageView* _tmp5_ = NULL;
-			PageView* _tmp6_ = NULL;
-			PageView* _tmp7_ = NULL;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp5_ = self->priv->selected_page_view;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp6_ = book_view_get_prev_page (self, _tmp5_);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp7_ = _tmp6_;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_select_page_view (self, _tmp7_);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_page_view_unref0 (_tmp7_);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			result = TRUE;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			return result;
-#line 3306 "book-view.c"
-		}
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case 0xff53:
-#line 3310 "book-view.c"
-		{
-			PageView* _tmp8_ = NULL;
-			PageView* _tmp9_ = NULL;
-			PageView* _tmp10_ = NULL;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp8_ = self->priv->selected_page_view;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp9_ = book_view_get_next_page (self, _tmp8_);
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp10_ = _tmp9_;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_select_page_view (self, _tmp10_);
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_page_view_unref0 (_tmp10_);
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			result = TRUE;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			return result;
-#line 3329 "book-view.c"
-		}
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case 0xFF57:
-#line 3333 "book-view.c"
-		{
-			Book* _tmp11_ = NULL;
-			Book* _tmp12_ = NULL;
-			guint _tmp13_ = 0U;
-			guint _tmp14_ = 0U;
-			Page* _tmp15_ = NULL;
-			Page* _tmp16_ = NULL;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp11_ = self->priv->_book;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp12_ = self->priv->_book;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp13_ = book_get_n_pages (_tmp12_);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp14_ = _tmp13_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp15_ = book_get_page (_tmp11_, ((gint) _tmp14_) - 1);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp16_ = _tmp15_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_set_selected_page (self, _tmp16_);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_page_unref0 (_tmp16_);
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			result = TRUE;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			return result;
-#line 3361 "book-view.c"
-		}
-		default:
-		{
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			result = FALSE;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			return result;
-#line 3369 "book-view.c"
-		}
-	}
-}
-
-
-static gboolean book_view_focus_cb (BookView* self, GtkWidget* widget, GdkEventFocus* event) {
-	gboolean result = FALSE;
-	PageView* _tmp0_ = NULL;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page_view;
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_selected_page_view (self, _tmp0_);
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = FALSE;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 3392 "book-view.c"
-}
-
-
-static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment) {
-	gboolean _tmp0_ = FALSE;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (adjustment != NULL);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->laying_out;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (!_tmp0_) {
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_redraw (self);
-#line 3408 "book-view.c"
-	}
-}
-
-
-void book_view_redraw (BookView* self) {
-	GtkWidget* _tmp0_ = NULL;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->drawing_area;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_queue_draw (_tmp0_);
-#line 3421 "book-view.c"
-}
-
-
-void book_view_select_next_page (BookView* self) {
-	PageView* _tmp0_ = NULL;
-	PageView* _tmp1_ = NULL;
-	PageView* _tmp2_ = NULL;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page_view;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = book_view_get_next_page (self, _tmp0_);
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = _tmp1_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_select_page_view (self, _tmp2_);
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (_tmp2_);
-#line 3441 "book-view.c"
-}
-
-
-void book_view_select_prev_page (BookView* self) {
-	PageView* _tmp0_ = NULL;
-	PageView* _tmp1_ = NULL;
-	PageView* _tmp2_ = NULL;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page_view;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = book_view_get_prev_page (self, _tmp0_);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = _tmp1_;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_select_page_view (self, _tmp2_);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (_tmp2_);
-#line 3461 "book-view.c"
-}
-
-
-Book* book_view_get_book (BookView* self) {
-	Book* result;
-	Book* _tmp0_ = NULL;
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->_book;
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = _tmp0_;
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 3476 "book-view.c"
-}
-
-
-static gpointer _book_ref0 (gpointer self) {
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return self ? book_ref (self) : NULL;
-#line 3483 "book-view.c"
-}
-
-
-static void book_view_set_book (BookView* self, Book* value) {
-	Book* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = value;
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = _book_ref0 (_tmp0_);
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_book_unref0 (self->priv->_book);
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->_book = _tmp1_;
-#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_notify ((GObject *) self, "book");
-#line 3502 "book-view.c"
-}
-
-
-Page* book_view_get_selected_page (BookView* self) {
-	Page* result;
-	PageView* _tmp0_ = NULL;
-#line 30 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page_view;
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp0_ != NULL) {
-#line 3515 "book-view.c"
-		PageView* _tmp1_ = NULL;
-		Page* _tmp2_ = NULL;
-		Page* _tmp3_ = NULL;
-#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp1_ = self->priv->selected_page_view;
-#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp2_ = page_view_get_page (_tmp1_);
-#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp3_ = _tmp2_;
-#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		result = _tmp3_;
-#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return result;
-#line 3529 "book-view.c"
-	} else {
-#line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		result = NULL;
-#line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return result;
-#line 3535 "book-view.c"
-	}
-}
-
-
-void book_view_set_selected_page (BookView* self, Page* value) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-#line 37 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = book_view_get_selected_page (self);
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = _tmp0_;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = value;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp1_ == _tmp2_) {
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return;
-#line 3557 "book-view.c"
-	}
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = value;
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp3_ != NULL) {
-#line 3563 "book-view.c"
-		GHashTable* _tmp4_ = NULL;
-		Page* _tmp5_ = NULL;
-		gconstpointer _tmp6_ = NULL;
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp4_ = self->priv->page_data;
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp5_ = value;
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_select_page_view (self, (PageView*) _tmp6_);
-#line 3575 "book-view.c"
-	} else {
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_select_page_view (self, NULL);
-#line 3579 "book-view.c"
-	}
-#line 37 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_notify ((GObject *) self, "selected-page");
-#line 3583 "book-view.c"
-}
-
-
-gint book_view_get_x_offset (BookView* self) {
-	gint result;
-	GtkAdjustment* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->adjustment;
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = (gint) _tmp1_;
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 3601 "book-view.c"
-}
-
-
-void book_view_set_x_offset (BookView* self, gint value) {
-	GtkAdjustment* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->adjustment;
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = value;
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_notify ((GObject *) self, "x-offset");
-#line 3618 "book-view.c"
-}
-
-
-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) {
-	typedef void (*GMarshalFunc_VOID__PAGE) (gpointer data1, gpointer arg_1, gpointer data2);
-	register GMarshalFunc_VOID__PAGE callback;
-	register GCClosure * cc;
-	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 3637 "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 3643 "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 3649 "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)->get_property = _vala_book_view_get_property;
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	G_OBJECT_CLASS (klass)->set_property = _vala_book_view_set_property;
-#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_object_class_install_property (G_OBJECT_CLASS (klass), BOOK_VIEW_BOOK, param_spec_book ("book", "book", "book", TYPE_BOOK, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), BOOK_VIEW_SELECTED_PAGE, param_spec_page ("selected-page", "selected-page", "selected-page", TYPE_PAGE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), BOOK_VIEW_X_OFFSET, g_param_spec_int ("x-offset", "x-offset", "x-offset", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#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 3676 "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_view = NULL;
-#line 3685 "book-view.c"
-}
-
-
-static void book_view_finalize (GObject* obj) {
-	BookView * self;
-	Book* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	Book* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	Book* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	Book* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	GtkWidget* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	GtkWidget* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	GtkWidget* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	GtkWidget* _tmp14_ = NULL;
-	guint _tmp15_ = 0U;
-	GtkWidget* _tmp16_ = NULL;
-	guint _tmp17_ = 0U;
-	GtkWidget* _tmp18_ = NULL;
-	guint _tmp19_ = 0U;
-	GtkWidget* _tmp20_ = NULL;
-	guint _tmp21_ = 0U;
-	GtkWidget* _tmp22_ = NULL;
-	guint _tmp23_ = 0U;
-	GtkAdjustment* _tmp24_ = NULL;
-	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 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->_book;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp1_, NULL, FALSE);
-#line 123 "/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 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = self->priv->_book;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp3_, NULL, FALSE);
-#line 124 "/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 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = self->priv->_book;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp5_, NULL, FALSE);
-#line 125 "/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 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp6_ = self->priv->_book;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp7_, NULL, FALSE);
-#line 126 "/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 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp8_ = self->priv->drawing_area;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("configure-event", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
-#line 127 "/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 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp10_ = self->priv->drawing_area;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("draw", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 128 "/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 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp12_ = self->priv->drawing_area;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("motion-notify-event", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
-#line 129 "/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 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = self->priv->drawing_area;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp15_, NULL, FALSE);
-#line 130 "/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 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp16_ = self->priv->drawing_area;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp17_, NULL, FALSE);
-#line 131 "/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 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp18_ = self->priv->drawing_area;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("button-release-event", gtk_widget_get_type (), &_tmp19_, NULL, FALSE);
-#line 132 "/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 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp20_ = self->priv->drawing_area;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("focus-in-event", gtk_widget_get_type (), &_tmp21_, NULL, FALSE);
-#line 133 "/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 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp22_ = self->priv->drawing_area;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp23_, NULL, FALSE);
-#line 134 "/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 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp24_ = self->priv->adjustment;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp25_, NULL, FALSE);
-#line 135 "/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_view);
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_g_object_unref0 (self->priv->drawing_area);
-#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_g_object_unref0 (self->priv->scroll);
-#line 54 "/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 3811 "book-view.c"
-}
-
-
-GType book_view_get_type (void) {
-	static volatile gsize book_view_type_id__volatile = 0;
-	if (g_once_init_enter (&book_view_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (BookViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) book_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BookView), 0, (GInstanceInitFunc) book_view_instance_init, NULL };
-		GType book_view_type_id;
-		book_view_type_id = g_type_register_static (gtk_box_get_type (), "BookView", &g_define_type_info, 0);
-		g_once_init_leave (&book_view_type_id__volatile, book_view_type_id);
-	}
-	return book_view_type_id__volatile;
-}
-
-
-static void _vala_book_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
-	BookView * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_BOOK_VIEW, BookView);
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	switch (property_id) {
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case BOOK_VIEW_BOOK:
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		value_set_book (value, book_view_get_book (self));
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		break;
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case BOOK_VIEW_SELECTED_PAGE:
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		value_set_page (value, book_view_get_selected_page (self));
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		break;
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case BOOK_VIEW_X_OFFSET:
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		g_value_set_int (value, book_view_get_x_offset (self));
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		break;
-#line 3850 "book-view.c"
-		default:
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		break;
-#line 3856 "book-view.c"
-	}
-}
-
-
-static void _vala_book_view_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
-	BookView * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_BOOK_VIEW, BookView);
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	switch (property_id) {
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case BOOK_VIEW_BOOK:
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_set_book (self, value_get_book (value));
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		break;
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case BOOK_VIEW_SELECTED_PAGE:
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_set_selected_page (self, value_get_page (value));
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		break;
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		case BOOK_VIEW_X_OFFSET:
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_set_x_offset (self, g_value_get_int (value));
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		break;
-#line 3884 "book-view.c"
-		default:
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		break;
-#line 3890 "book-view.c"
-	}
-}
-
-
-
diff --git a/src/book-view.vala b/src/book-view.vala
index 069525e..9a9c9bb 100644
--- a/src/book-view.vala
+++ b/src/book-view.vala
@@ -295,26 +295,30 @@ public class BookView : Gtk.Box
 
     private void layout_into (int width, int height, out int book_width, out int book_height)
     {
+        var pages = new List<PageView> ();
+        for (var i = 0; i < book.n_pages; i++)
+            pages.append (get_nth_page (i));
+
         /* Get maximum page resolution */
         int max_dpi = 0;
-        for (var i = 0; i < book.n_pages; i++)
+        foreach (var page in pages)
         {
-            var page = book.get_page (i);
-            if (page.dpi > max_dpi)
-                max_dpi = page.dpi;
+            var p = page.page;
+            if (p.dpi > max_dpi)
+                max_dpi = p.dpi;
         }
 
         /* Get area required to fit all pages */
         int max_width = 0, max_height = 0;
-        for (var i = 0; i < book.n_pages; i++)
+        foreach (var page in pages)
         {
-            var page = book.get_page (i);
-            var w = page.width;
-            var h = page.height;
+            var p = page.page;
+            var w = p.width;
+            var h = p.height;
 
             /* Scale to the same DPI */
-            w = (int) ((double)w * max_dpi / page.dpi + 0.5);
-            h = (int) ((double)h * max_dpi / page.dpi + 0.5);
+            w = (int) ((double)w * max_dpi / p.dpi + 0.5);
+            h = (int) ((double)h * max_dpi / p.dpi + 0.5);
 
             if (w > max_width)
                 max_width = w;
@@ -329,9 +333,8 @@ public class BookView : Gtk.Box
         int spacing = 12;
         book_width = 0;
         book_height = 0;
-        for (var i = 0; i < book.n_pages; i++)
+        foreach (var page in pages)
         {
-            var page = get_nth_page (i);
             var p = page.page;
 
             /* NOTE: Using double to avoid overflow for large images */
@@ -351,16 +354,14 @@ public class BookView : Gtk.Box
             var h = page.height;
             if (h > book_height)
                 book_height = h;
-            book_width += page.width;
-            if (i != 0)
-                book_width += spacing;
+            book_width += page.width + spacing;
         }
+        if (pages != null)
+            book_width -= spacing;
 
         int x_offset = 0;
-        for (var i = 0; i < book.n_pages; i++)
+        foreach (var page in pages)
         {
-            var page = get_nth_page (i);
-
             /* Layout pages left to right */
             page.x_offset = x_offset;
             x_offset += page.width + spacing;
@@ -432,18 +433,18 @@ public class BookView : Gtk.Box
 
     private bool draw_cb (Gtk.Widget widget, Cairo.Context context)
     {
-        if (book.n_pages == 0)
-            return false;
-
         layout ();
 
         double left, top, right, bottom;
         context.clip_extents (out left, out top, out right, out bottom);
 
-        /* Render each page */
+        var pages = new List<PageView> ();
         for (var i = 0; i < book.n_pages; i++)
+            pages.append (get_nth_page (i));
+
+        /* Render each page */
+        foreach (var page in pages)
         {
-            var page = get_nth_page (i);
             var left_edge = page.x_offset - x_offset;
             var right_edge = page.x_offset + page.width - x_offset;
 
diff --git a/src/book.c b/src/book.c
deleted file mode 100644
index a74c530..0000000
--- a/src/book.c
+++ /dev/null
@@ -1,6429 +0,0 @@
-/* book.c generated by valac 0.34.6, the Vala compiler
- * generated from book.vala, do not modify */
-
-/*
- * Copyright (C) 2009-2015 Canonical Ltd.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 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.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gio/gio.h>
-#include <cairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <float.h>
-#include <math.h>
-#include <gdk/gdk.h>
-#include <cairo-ps.h>
-#include <zlib.h>
-#include <gobject/gvaluecollector.h>
-
-
-#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;
-typedef struct _BookPrivate BookPrivate;
-
-#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 _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 _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
-
-#define TYPE_PS_WRITER (ps_writer_get_type ())
-#define PS_WRITER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PS_WRITER, PsWriter))
-#define PS_WRITER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PS_WRITER, PsWriterClass))
-#define IS_PS_WRITER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PS_WRITER))
-#define IS_PS_WRITER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PS_WRITER))
-#define PS_WRITER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PS_WRITER, PsWriterClass))
-
-typedef struct _PsWriter PsWriter;
-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))
-#define PDF_WRITER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PDF_WRITER, PDFWriterClass))
-#define IS_PDF_WRITER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PDF_WRITER))
-#define IS_PDF_WRITER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PDF_WRITER))
-#define PDF_WRITER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PDF_WRITER, PDFWriterClass))
-
-typedef struct _PDFWriter PDFWriter;
-typedef struct _PDFWriterClass PDFWriterClass;
-typedef struct _PDFWriterPrivate PDFWriterPrivate;
-#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
-#define _pdf_writer_unref0(var) ((var == NULL) ? NULL : (var = (pdf_writer_unref (var), NULL)))
-typedef struct _ParamSpecBook ParamSpecBook;
-typedef struct _ParamSpecPDFWriter ParamSpecPDFWriter;
-typedef struct _ParamSpecPsWriter ParamSpecPsWriter;
-
-struct _Book {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	BookPrivate * priv;
-};
-
-struct _BookClass {
-	GTypeClass parent_class;
-	void (*finalize) (Book *self);
-};
-
-struct _BookPrivate {
-	GList* pages;
-	gboolean needs_saving_;
-	GByteArray* jpeg_data;
-};
-
-struct _PsWriter {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PsWriterPrivate * priv;
-	cairo_surface_t* surface;
-	GFileOutputStream* stream;
-};
-
-struct _PsWriterClass {
-	GTypeClass parent_class;
-	void (*finalize) (PsWriter *self);
-};
-
-struct _PDFWriter {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PDFWriterPrivate * priv;
-	gsize offset;
-	guint* object_offsets;
-	gint object_offsets_length1;
-	gint _object_offsets_size_;
-};
-
-struct _PDFWriterClass {
-	GTypeClass parent_class;
-	void (*finalize) (PDFWriter *self);
-};
-
-struct _ParamSpecBook {
-	GParamSpec parent_instance;
-};
-
-struct _PDFWriterPrivate {
-	GFileOutputStream* stream;
-};
-
-struct _ParamSpecPDFWriter {
-	GParamSpec parent_instance;
-};
-
-struct _ParamSpecPsWriter {
-	GParamSpec parent_instance;
-};
-
-
-static gpointer book_parent_class = NULL;
-static gpointer pdf_writer_parent_class = NULL;
-static gpointer ps_writer_parent_class = NULL;
-
-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 BOOK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BOOK, BookPrivate))
-enum  {
-	BOOK_DUMMY_PROPERTY
-};
-static void book_page_changed_cb (Book* self, Page* page);
-static void _book_page_changed_cb_page_pixels_changed (Page* _sender, gpointer self);
-static void _book_page_changed_cb_page_crop_changed (Page* _sender, gpointer self);
-static void _page_unref0_ (gpointer var);
-static void _g_list_free__page_unref0_ (GList* self);
-Book* book_new (void);
-Book* book_construct (GType object_type);
-void book_clear (Book* self);
-void book_set_needs_saving (Book* self, gboolean value);
-void book_append_page (Book* self, Page* page);
-void book_move_page (Book* self, Page* page, guint location);
-void book_reverse (Book* self);
-void book_combine_sides (Book* self);
-guint book_get_n_pages (Book* self);
-void book_combine_sides_reverse (Book* self);
-void book_delete_page (Book* self, Page* page);
-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, 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);
-gpointer ps_writer_ref (gpointer instance);
-void ps_writer_unref (gpointer instance);
-GParamSpec* param_spec_ps_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_ps_writer (GValue* value, gpointer v_object);
-void value_take_ps_writer (GValue* value, gpointer v_object);
-gpointer value_get_ps_writer (const GValue* value);
-GType ps_writer_get_type (void) G_GNUC_CONST;
-PsWriter* ps_writer_new (GFileOutputStream* stream);
-PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream);
-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 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);
-gpointer pdf_writer_ref (gpointer instance);
-void pdf_writer_unref (gpointer instance);
-GParamSpec* param_spec_pdf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pdf_writer (GValue* value, gpointer v_object);
-void value_take_pdf_writer (GValue* value, gpointer v_object);
-gpointer value_get_pdf_writer (const GValue* value);
-GType pdf_writer_get_type (void) G_GNUC_CONST;
-PDFWriter* pdf_writer_new (GFileOutputStream* stream);
-PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream);
-guint pdf_writer_add_object (PDFWriter* self);
-void pdf_writer_write_string (PDFWriter* self, const gchar* text);
-void pdf_writer_start_object (PDFWriter* self, guint index);
-gboolean page_get_is_color (Page* self);
-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);
-static gint book_next_empty_object (PDFWriter* writer, gint start);
-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);
-#define PDF_WRITER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PDF_WRITER, PDFWriterPrivate))
-enum  {
-	PDF_WRITER_DUMMY_PROPERTY
-};
-static void pdf_writer_finalize (PDFWriter* obj);
-enum  {
-	PS_WRITER_DUMMY_PROPERTY
-};
-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 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return self ? page_ref (self) : NULL;
-#line 251 "book.c"
-}
-
-
-static void _book_page_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_page_changed_cb ((Book*) self, _sender);
-#line 258 "book.c"
-}
-
-
-static void _book_page_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
-#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_page_changed_cb ((Book*) self, _sender);
-#line 265 "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 272 "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 281 "book.c"
-}
-
-
-Book* book_construct (GType object_type) {
-	Book* self = NULL;
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self = (Book*) g_type_create_instance (object_type);
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = NULL;
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return self;
-#line 295 "book.c"
-}
-
-
-Book* book_new (void) {
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return book_construct (TYPE_BOOK);
-#line 302 "book.c"
-}
-
-
-void book_clear (Book* self) {
-	GList* _tmp0_ = NULL;
-#line 52 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->pages;
-#line 312 "book.c"
-	{
-		GList* page_collection = NULL;
-		GList* page_it = NULL;
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		page_collection = _tmp0_;
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
-#line 320 "book.c"
-			Page* _tmp1_ = NULL;
-			Page* page = NULL;
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp1_ = _page_ref0 ((Page*) page_it->data);
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			page = _tmp1_;
-#line 327 "book.c"
-			{
-				Page* _tmp2_ = NULL;
-				guint _tmp3_ = 0U;
-				Page* _tmp4_ = NULL;
-				guint _tmp5_ = 0U;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp2_ = page;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 56 "/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 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp4_ = page;
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
-#line 57 "/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 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_page_unref0 (page);
-#line 347 "book.c"
-			}
-		}
-	}
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = NULL;
-#line 60 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "cleared");
-#line 357 "book.c"
-}
-
-
-static void book_page_changed_cb (Book* self, Page* page) {
-#line 63 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 63 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (page != NULL);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_set_needs_saving (self, TRUE);
-#line 368 "book.c"
-}
-
-
-void book_append_page (Book* self, Page* page) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-#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"
-	g_signal_connect (_tmp0_, "pixels-changed", (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = page;
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_connect (_tmp1_, "crop-changed", (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = page;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = _page_ref0 (_tmp2_);
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = g_list_append (self->priv->pages, _tmp3_);
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = page;
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "page-added", _tmp4_);
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_set_needs_saving (self, TRUE);
-#line 402 "book.c"
-}
-
-
-void book_move_page (Book* self, Page* page, guint location) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (page != NULL);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = page;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = g_list_remove (self->priv->pages, _tmp0_);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = page;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = _page_ref0 (_tmp1_);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = location;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = g_list_insert (self->priv->pages, _tmp2_, (gint) _tmp3_);
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "reordered");
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_set_needs_saving (self, TRUE);
-#line 431 "book.c"
-}
-
-
-void book_reverse (Book* self) {
-	GList* new_pages = NULL;
-	GList* _tmp0_ = NULL;
-	GList* _tmp4_ = NULL;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	new_pages = NULL;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->pages;
-#line 445 "book.c"
-	{
-		GList* page_collection = NULL;
-		GList* page_it = NULL;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		page_collection = _tmp0_;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
-#line 453 "book.c"
-			Page* _tmp1_ = NULL;
-			Page* page = NULL;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp1_ = _page_ref0 ((Page*) page_it->data);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			page = _tmp1_;
-#line 460 "book.c"
-			{
-				Page* _tmp2_ = NULL;
-				Page* _tmp3_ = NULL;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp2_ = page;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp3_ = _page_ref0 (_tmp2_);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				new_pages = g_list_prepend (new_pages, _tmp3_);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_page_unref0 (page);
-#line 472 "book.c"
-			}
-		}
-	}
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = new_pages;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	new_pages = NULL;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = _tmp4_;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "reordered");
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_set_needs_saving (self, TRUE);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	__g_list_free__page_unref0_0 (new_pages);
-#line 490 "book.c"
-}
-
-
-void book_combine_sides (Book* self) {
-	guint n_front = 0U;
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	GList* new_pages = NULL;
-	GList* _tmp19_ = NULL;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = book_get_n_pages (self);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = _tmp0_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = book_get_n_pages (self);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = _tmp2_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	n_front = _tmp1_ - (_tmp3_ / 2);
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	new_pages = NULL;
-#line 516 "book.c"
-	{
-		gint i = 0;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 521 "book.c"
-		{
-			gboolean _tmp4_ = FALSE;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp4_ = TRUE;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 528 "book.c"
-				gint _tmp6_ = 0;
-				guint _tmp7_ = 0U;
-				guint _tmp8_ = 0U;
-				gint _tmp9_ = 0;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp4_) {
-#line 535 "book.c"
-					gint _tmp5_ = 0;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp5_ = i;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp5_ + 1;
-#line 541 "book.c"
-				}
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp4_ = FALSE;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp6_ = i;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp7_ = book_get_n_pages (self);
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp8_ = _tmp7_;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp6_) < _tmp8_)) {
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 555 "book.c"
-				}
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp9_ = i;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if ((_tmp9_ % 2) == 0) {
-#line 561 "book.c"
-					GList* _tmp10_ = NULL;
-					gint _tmp11_ = 0;
-					gconstpointer _tmp12_ = NULL;
-					Page* _tmp13_ = NULL;
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp10_ = self->priv->pages;
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp11_ = i;
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp12_ = g_list_nth_data (_tmp10_, (guint) (_tmp11_ / 2));
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp13_ = _page_ref0 ((Page*) _tmp12_);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					new_pages = g_list_append (new_pages, _tmp13_);
-#line 576 "book.c"
-				} else {
-					GList* _tmp14_ = NULL;
-					guint _tmp15_ = 0U;
-					gint _tmp16_ = 0;
-					gconstpointer _tmp17_ = NULL;
-					Page* _tmp18_ = NULL;
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp14_ = self->priv->pages;
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp15_ = n_front;
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp16_ = i;
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp17_ = g_list_nth_data (_tmp14_, _tmp15_ + (_tmp16_ / 2));
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp18_ = _page_ref0 ((Page*) _tmp17_);
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					new_pages = g_list_append (new_pages, _tmp18_);
-#line 595 "book.c"
-				}
-			}
-		}
-	}
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp19_ = new_pages;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	new_pages = NULL;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = _tmp19_;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "reordered");
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_set_needs_saving (self, TRUE);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	__g_list_free__page_unref0_0 (new_pages);
-#line 614 "book.c"
-}
-
-
-void book_combine_sides_reverse (Book* self) {
-	GList* new_pages = NULL;
-	GList* _tmp16_ = NULL;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	new_pages = NULL;
-#line 625 "book.c"
-	{
-		gint i = 0;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 630 "book.c"
-		{
-			gboolean _tmp0_ = FALSE;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp0_ = TRUE;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 637 "book.c"
-				gint _tmp2_ = 0;
-				guint _tmp3_ = 0U;
-				guint _tmp4_ = 0U;
-				gint _tmp5_ = 0;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp0_) {
-#line 644 "book.c"
-					gint _tmp1_ = 0;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp1_ = i;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp1_ + 1;
-#line 650 "book.c"
-				}
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp0_ = FALSE;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp2_ = i;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp3_ = book_get_n_pages (self);
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp4_ = _tmp3_;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp2_) < _tmp4_)) {
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 664 "book.c"
-				}
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp5_ = i;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if ((_tmp5_ % 2) == 0) {
-#line 670 "book.c"
-					GList* _tmp6_ = NULL;
-					gint _tmp7_ = 0;
-					gconstpointer _tmp8_ = NULL;
-					Page* _tmp9_ = NULL;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp6_ = self->priv->pages;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp7_ = i;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp8_ = g_list_nth_data (_tmp6_, (guint) (_tmp7_ / 2));
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp9_ = _page_ref0 ((Page*) _tmp8_);
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					new_pages = g_list_append (new_pages, _tmp9_);
-#line 685 "book.c"
-				} else {
-					GList* _tmp10_ = NULL;
-					guint _tmp11_ = 0U;
-					guint _tmp12_ = 0U;
-					gint _tmp13_ = 0;
-					gconstpointer _tmp14_ = NULL;
-					Page* _tmp15_ = NULL;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp10_ = self->priv->pages;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp11_ = book_get_n_pages (self);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp12_ = _tmp11_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp13_ = i;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp14_ = g_list_nth_data (_tmp10_, (_tmp12_ - 1) - (_tmp13_ / 2));
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp15_ = _page_ref0 ((Page*) _tmp14_);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					new_pages = g_list_append (new_pages, _tmp15_);
-#line 707 "book.c"
-				}
-			}
-		}
-	}
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp16_ = new_pages;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	new_pages = NULL;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = _tmp16_;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "reordered");
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_set_needs_saving (self, TRUE);
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	__g_list_free__page_unref0_0 (new_pages);
-#line 726 "book.c"
-}
-
-
-void book_delete_page (Book* self, Page* page) {
-	Page* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	Page* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (page != NULL);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = page;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 132 "/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 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = page;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 133 "/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 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = page;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = g_list_remove (self->priv->pages, _tmp4_);
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = page;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "page-removed", _tmp5_);
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_set_needs_saving (self, TRUE);
-#line 763 "book.c"
-}
-
-
-Page* book_get_page (Book* self, gint page_number) {
-	Page* result = NULL;
-	gint _tmp0_ = 0;
-	GList* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gconstpointer _tmp6_ = NULL;
-	Page* _tmp7_ = NULL;
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = page_number;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_tmp0_ < 0) {
-#line 780 "book.c"
-		GList* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		gint _tmp3_ = 0;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp1_ = self->priv->pages;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp2_ = g_list_length (_tmp1_);
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp3_ = page_number;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		page_number = ((gint) _tmp2_) + _tmp3_;
-#line 792 "book.c"
-	}
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = self->priv->pages;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = page_number;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp6_ = g_list_nth_data (_tmp4_, (guint) _tmp5_);
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp7_ = _page_ref0 ((Page*) _tmp6_);
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = _tmp7_;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 806 "book.c"
-}
-
-
-guint book_get_page_index (Book* self, Page* page) {
-	guint result = 0U;
-	GList* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, 0U);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (page != NULL, 0U);
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->pages;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = page;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = g_list_index (_tmp0_, _tmp1_);
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = (guint) _tmp2_;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 829 "book.c"
-}
-
-
-static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 854 "book.c"
-		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 862 "book.c"
-	} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 868 "book.c"
-	}
-}
-
-
-static gchar* string_slice (const gchar* self, glong start, glong end) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
-	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
-	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp2_ < ((glong) 0)) {
-#line 902 "book.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		start = _tmp3_ + _tmp4_;
-#line 911 "book.c"
-	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp5_ < ((glong) 0)) {
-#line 917 "book.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		end = _tmp6_ + _tmp7_;
-#line 926 "book.c"
-	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp9_ >= ((glong) 0)) {
-#line 932 "book.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 941 "book.c"
-	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = FALSE;
-#line 945 "book.c"
-	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp13_ >= ((glong) 0)) {
-#line 953 "book.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 962 "book.c"
-	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = FALSE;
-#line 966 "book.c"
-	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 988 "book.c"
-}
-
-
-static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
-	GFile* result = NULL;
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
-	gchar* basename = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* prefix = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* suffix = NULL;
-	gchar* _tmp8_ = NULL;
-	gint extension_index = 0;
-	const gchar* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gint width = 0;
-	guint _tmp26_ = 0U;
-	guint _tmp27_ = 0U;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	gint _tmp30_ = 0;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	gchar* number_format = NULL;
-	gint _tmp33_ = 0;
-	gchar* _tmp34_ = NULL;
-	gchar* filename = NULL;
-	const gchar* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	const gchar* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
-	const gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	const gchar* _tmp47_ = NULL;
-	GFile* _tmp48_ = NULL;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (uri != NULL, NULL);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = book_get_n_pages (self);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = _tmp0_;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_tmp1_ == ((guint) 1)) {
-#line 1044 "book.c"
-		const gchar* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp2_ = uri;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp3_ = g_file_new_for_uri (_tmp2_);
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		result = _tmp3_;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return result;
-#line 1055 "book.c"
-	}
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = uri;
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = g_path_get_basename (_tmp4_);
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	basename = _tmp5_;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp6_ = uri;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp7_ = g_strdup (_tmp6_);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	prefix = _tmp7_;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp8_ = g_strdup ("");
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	suffix = _tmp8_;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp9_ = basename;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp10_ = string_last_index_of_char (_tmp9_, (gunichar) '.', 0);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	extension_index = _tmp10_;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp11_ = extension_index;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_tmp11_ >= 0) {
-#line 1083 "book.c"
-		const gchar* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		const gchar* _tmp14_ = NULL;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		gchar* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
-		const gchar* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		gchar* _tmp25_ = NULL;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp12_ = basename;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp13_ = extension_index;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp14_ = basename;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp15_ = strlen (_tmp14_);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp16_ = _tmp15_;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp17_ = string_slice (_tmp12_, (glong) _tmp13_, (glong) _tmp16_);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_g_free0 (suffix);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		suffix = _tmp17_;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp18_ = uri;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp19_ = uri;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp20_ = strlen (_tmp19_);
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp21_ = _tmp20_;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp22_ = suffix;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp23_ = strlen (_tmp22_);
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp24_ = _tmp23_;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp25_ = string_slice (_tmp18_, (glong) 0, (glong) (_tmp21_ - _tmp24_));
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_g_free0 (prefix);
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		prefix = _tmp25_;
-#line 1134 "book.c"
-	}
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp26_ = book_get_n_pages (self);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp27_ = _tmp26_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp28_ = g_strdup_printf ("%u", _tmp27_);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp29_ = _tmp28_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp30_ = strlen (_tmp29_);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp31_ = _tmp30_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp32_ = _tmp31_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp29_);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	width = _tmp32_;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp33_ = width;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp34_ = g_strdup_printf ("%%0%dd", _tmp33_);
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	number_format = _tmp34_;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp35_ = prefix;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp36_ = g_strconcat (_tmp35_, "-", NULL);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp37_ = _tmp36_;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp38_ = number_format;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp39_ = i;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp40_ = g_strdup_printf (_tmp38_, _tmp39_ + 1);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp41_ = _tmp40_;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp42_ = g_strconcat (_tmp37_, _tmp41_, NULL);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp43_ = _tmp42_;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp44_ = suffix;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp45_ = g_strconcat (_tmp43_, _tmp44_, NULL);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp46_ = _tmp45_;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp43_);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp41_);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp37_);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	filename = _tmp46_;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp47_ = filename;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp48_ = g_file_new_for_uri (_tmp47_);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = _tmp48_;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (filename);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (number_format);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (suffix);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (prefix);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (basename);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 1210 "book.c"
-}
-
-
-static void book_save_multi_file (Book* self, const gchar* type, gint quality, GFile* file, GError** error) {
-	GError * _inner_error_ = NULL;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (type != NULL);
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (file != NULL);
-#line 1222 "book.c"
-	{
-		gint i = 0;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 1227 "book.c"
-		{
-			gboolean _tmp0_ = FALSE;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp0_ = TRUE;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 1234 "book.c"
-				gint _tmp2_ = 0;
-				guint _tmp3_ = 0U;
-				guint _tmp4_ = 0U;
-				Page* page = NULL;
-				gint _tmp5_ = 0;
-				Page* _tmp6_ = NULL;
-				Page* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				GFile* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				GFile* _tmp14_ = NULL;
-				GFile* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp0_) {
-#line 1253 "book.c"
-					gint _tmp1_ = 0;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp1_ = i;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp1_ + 1;
-#line 1259 "book.c"
-				}
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp0_ = FALSE;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp2_ = i;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp3_ = book_get_n_pages (self);
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp4_ = _tmp3_;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp2_) < _tmp4_)) {
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 1273 "book.c"
-				}
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp5_ = i;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp6_ = book_get_page (self, _tmp5_);
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp6_;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp7_ = page;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp8_ = type;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp9_ = quality;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp10_ = file;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp11_ = g_file_get_uri (_tmp10_);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp12_ = _tmp11_;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp13_ = i;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp14_ = book_make_indexed_file (self, _tmp12_, _tmp13_);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp15_ = _tmp14_;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_save (_tmp7_, _tmp8_, _tmp9_, _tmp15_, &_inner_error_);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_object_unref0 (_tmp15_);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp12_);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					g_propagate_error (error, _inner_error_);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_page_unref0 (page);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					return;
-#line 1313 "book.c"
-				}
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp16_ = i;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp16_);
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_page_unref0 (page);
-#line 1321 "book.c"
-			}
-		}
-	}
-}
-
-
-static void book_save_ps_pdf_surface (Book* self, cairo_surface_t* surface, GdkPixbuf* image, gdouble dpi) {
-	cairo_t* context = NULL;
-	cairo_surface_t* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	GdkPixbuf* _tmp4_ = NULL;
-	cairo_pattern_t* _tmp5_ = NULL;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (surface != NULL);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (image != NULL);
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = surface;
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = cairo_create (_tmp0_);
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	context = _tmp1_;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = dpi;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = dpi;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	cairo_scale (context, 72.0 / _tmp2_, 72.0 / _tmp3_);
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = image;
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	gdk_cairo_set_source_pixbuf (context, _tmp4_, (gdouble) 0, (gdouble) 0);
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = cairo_get_source (context);
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	cairo_pattern_set_filter (_tmp5_, CAIRO_FILTER_BEST);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	cairo_paint (context);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_cairo_destroy0 (context);
-#line 1366 "book.c"
-}
-
-
-static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return self ? cairo_surface_reference (self) : NULL;
-#line 1373 "book.c"
-}
-
-
-static void book_save_ps (Book* self, GFile* file, GError** error) {
-	GFileOutputStream* stream = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileOutputStream* _tmp1_ = NULL;
-	PsWriter* writer = NULL;
-	PsWriter* _tmp2_ = NULL;
-	cairo_surface_t* surface = NULL;
-	PsWriter* _tmp3_ = NULL;
-	cairo_surface_t* _tmp4_ = NULL;
-	cairo_surface_t* _tmp5_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (file != NULL);
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = file;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	stream = _tmp1_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_propagate_error (error, _inner_error_);
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return;
-#line 1404 "book.c"
-	}
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = ps_writer_new (stream);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	writer = _tmp2_;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = writer;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = _tmp3_->surface;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = _cairo_surface_reference0 (_tmp4_);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	surface = _tmp5_;
-#line 1418 "book.c"
-	{
-		gint i = 0;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 1423 "book.c"
-		{
-			gboolean _tmp6_ = FALSE;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp6_ = TRUE;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 1430 "book.c"
-				gint _tmp8_ = 0;
-				guint _tmp9_ = 0U;
-				guint _tmp10_ = 0U;
-				Page* page = NULL;
-				gint _tmp11_ = 0;
-				Page* _tmp12_ = NULL;
-				GdkPixbuf* image = NULL;
-				Page* _tmp13_ = NULL;
-				GdkPixbuf* _tmp14_ = NULL;
-				gdouble width = 0.0;
-				GdkPixbuf* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gint _tmp17_ = 0;
-				Page* _tmp18_ = NULL;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
-				gdouble height = 0.0;
-				GdkPixbuf* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
-				gint _tmp23_ = 0;
-				Page* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
-				cairo_surface_t* _tmp27_ = NULL;
-				gdouble _tmp28_ = 0.0;
-				gdouble _tmp29_ = 0.0;
-				cairo_surface_t* _tmp30_ = NULL;
-				GdkPixbuf* _tmp31_ = NULL;
-				Page* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gint _tmp34_ = 0;
-				cairo_surface_t* _tmp35_ = NULL;
-				gint _tmp36_ = 0;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp6_) {
-#line 1466 "book.c"
-					gint _tmp7_ = 0;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp7_ = i;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp7_ + 1;
-#line 1472 "book.c"
-				}
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp6_ = FALSE;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp8_ = i;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp9_ = book_get_n_pages (self);
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp10_ = _tmp9_;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp8_) < _tmp10_)) {
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 1486 "book.c"
-				}
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp11_ = i;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp12_ = book_get_page (self, _tmp11_);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp12_;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp13_ = page;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp14_ = page_get_image (_tmp13_, TRUE);
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				image = _tmp14_;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp15_ = image;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp16_ = gdk_pixbuf_get_width (_tmp15_);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp17_ = _tmp16_;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp18_ = page;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp19_ = page_get_dpi (_tmp18_);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp20_ = _tmp19_;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width = (_tmp17_ * 72.0) / _tmp20_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp21_ = image;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp22_ = gdk_pixbuf_get_height (_tmp21_);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp23_ = _tmp22_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp24_ = page;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp25_ = page_get_dpi (_tmp24_);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp26_ = _tmp25_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height = (_tmp23_ * 72.0) / _tmp26_;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp27_ = surface;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp28_ = width;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp29_ = height;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				cairo_ps_surface_set_size (_tmp27_, _tmp28_, _tmp29_);
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp30_ = surface;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp31_ = image;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp32_ = page;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp33_ = page_get_dpi (_tmp32_);
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp34_ = _tmp33_;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				book_save_ps_pdf_surface (self, _tmp30_, _tmp31_, (gdouble) _tmp34_);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp35_ = surface;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				cairo_surface_show_page (_tmp35_);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp36_ = i;
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp36_);
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_object_unref0 (image);
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_page_unref0 (page);
-#line 1560 "book.c"
-			}
-		}
-	}
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_cairo_surface_destroy0 (surface);
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_ps_writer_unref0 (writer);
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_object_unref0 (stream);
-#line 1570 "book.c"
-}
-
-
-static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, int* result_length1) {
-	guint8* result = NULL;
-	z_stream stream = {0};
-	guint8* out_data = NULL;
-	guint8* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	guint8* _tmp1_ = NULL;
-	gint out_data_length1 = 0;
-	gint _out_data_size_ = 0;
-	guint8* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	z_stream _tmp7_ = {0};
-	guint _tmp8_ = 0U;
-	guint n_written = 0U;
-	guint8* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	z_stream _tmp11_ = {0};
-	guint _tmp12_ = 0U;
-	guint _tmp13_ = 0U;
-	gint _tmp14_ = 0;
-	guint8* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	deflateInit (&stream, (gint) Z_BEST_COMPRESSION);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = data;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0__length1 = data_length1;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = g_new0 (guint8, _tmp0__length1);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	out_data = _tmp1_;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	out_data_length1 = _tmp0__length1;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_out_data_size_ = out_data_length1;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = data;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2__length1 = data_length1;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	stream.next_in = _tmp2_;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	stream.avail_in = _tmp2__length1;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = out_data;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3__length1 = out_data_length1;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	stream.next_out = _tmp3_;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	stream.avail_out = _tmp3__length1;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	while (TRUE) {
-#line 1632 "book.c"
-		z_stream _tmp4_ = {0};
-		guint _tmp5_ = 0U;
-		gint _tmp6_ = 0;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp4_ = stream;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp5_ = _tmp4_.avail_in;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (!(_tmp5_ > ((guint) 0))) {
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			break;
-#line 1644 "book.c"
-		}
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp6_ = deflate (&stream, (gint) Z_FINISH);
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (_tmp6_ == ((gint) Z_STREAM_ERROR)) {
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			break;
-#line 1652 "book.c"
-		}
-	}
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp7_ = stream;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp8_ = _tmp7_.avail_in;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_tmp8_ > ((guint) 0)) {
-#line 1661 "book.c"
-		guint8* _tmp9_ = NULL;
-		gint _tmp9__length1 = 0;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp9_ = NULL;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp9__length1 = 0;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (result_length1) {
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			*result_length1 = _tmp9__length1;
-#line 1672 "book.c"
-		}
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		result = _tmp9_;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		out_data = (g_free (out_data), NULL);
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		deflateEnd (&stream);
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return result;
-#line 1682 "book.c"
-	}
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp10_ = data;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp10__length1 = data_length1;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp11_ = stream;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp12_ = _tmp11_.avail_out;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	n_written = _tmp10__length1 - _tmp12_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp13_ = n_written;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp14_ = (gint) _tmp13_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	out_data = g_renew (guint8, out_data, (gint) _tmp13_);
-#line 226 "/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 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	out_data_length1 = _tmp14_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_out_data_size_ = _tmp14_;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp15_ = out_data;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp15__length1 = out_data_length1;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (result_length1) {
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		*result_length1 = _tmp15__length1;
-#line 1714 "book.c"
-	}
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = _tmp15_;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	deflateEnd (&stream);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 1722 "book.c"
-}
-
-
-static gboolean _book_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) {
-	gboolean result;
-	result = book_write_pixbuf_data ((Book*) self, buf, buf_length1, error);
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 1731 "book.c"
-}
-
-
-static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, gint dpi, int* result_length1) {
-	guint8* result = NULL;
-	GByteArray* _tmp0_ = NULL;
-	gchar** keys = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint keys_length1 = 0;
-	gint _keys_size_ = 0;
-	gchar** values = NULL;
-	gint _tmp6_ = 0;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gchar* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gchar* _tmp12_ = NULL;
-	gchar** _tmp13_ = NULL;
-	gint values_length1 = 0;
-	gint _values_size_ = 0;
-	guint8* data = NULL;
-	GByteArray* _tmp15_ = NULL;
-	guint8* _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	gint data_length1 = 0;
-	gint _data_size_ = 0;
-	guint8* _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	GError * _inner_error_ = NULL;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (image != NULL, NULL);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = g_byte_array_new ();
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->jpeg_data = _tmp0_;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = g_strdup ("quality");
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = g_strdup ("density-unit");
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = g_strdup ("x-density");
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = g_strdup ("y-density");
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = g_new0 (gchar*, 5 + 1);
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_[0] = _tmp1_;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_[1] = _tmp2_;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_[2] = _tmp3_;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_[3] = _tmp4_;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_[4] = NULL;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	keys = _tmp5_;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	keys_length1 = 5;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_keys_size_ = keys_length1;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp6_ = quality;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp7_ = g_strdup_printf ("%d", _tmp6_);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp8_ = g_strdup ("dots-per-inch");
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp9_ = dpi;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp10_ = g_strdup_printf ("%d", _tmp9_);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp11_ = dpi;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp12_ = g_strdup_printf ("%d", _tmp11_);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp13_ = g_new0 (gchar*, 5 + 1);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp13_[0] = _tmp7_;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp13_[1] = _tmp8_;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp13_[2] = _tmp10_;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp13_[3] = _tmp12_;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp13_[4] = NULL;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	values = _tmp13_;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	values_length1 = 5;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_values_size_ = values_length1;
-#line 1834 "book.c"
-	{
-		GdkPixbuf* _tmp14_ = NULL;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp14_ = image;
-#line 240 "/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 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1843 "book.c"
-			goto __catch0_g_error;
-		}
-	}
-	goto __finally0;
-	__catch0_g_error:
-	{
-		GError* e = NULL;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		e = _inner_error_;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_inner_error_ = NULL;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_g_error_free0 (e);
-#line 1857 "book.c"
-	}
-	__finally0:
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 238 "/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 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_clear_error (&_inner_error_);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return NULL;
-#line 1872 "book.c"
-	}
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp15_ = self->priv->jpeg_data;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp16_ = _tmp15_->data;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp16__length1 = _tmp15_->len;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp15_->data = NULL;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp15_->len = 0;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	data = _tmp16_;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	data_length1 = _tmp16__length1;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_data_size_ = data_length1;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->jpeg_data = NULL;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp17_ = data;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp17__length1 = data_length1;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (result_length1) {
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		*result_length1 = _tmp17__length1;
-#line 1902 "book.c"
-	}
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = _tmp17_;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 1912 "book.c"
-}
-
-
-static gboolean book_write_pixbuf_data (Book* self, guint8* buf, int buf_length1, GError** error) {
-	gboolean result = FALSE;
-	GByteArray* _tmp0_ = NULL;
-	guint8* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->jpeg_data;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = buf;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1__length1 = buf_length1;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_byte_array_append (_tmp0_, _tmp1_, _tmp1__length1);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = TRUE;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 1935 "book.c"
-}
-
-
-static gchar* g_unichar_to_string (gunichar self) {
-	gchar* result = NULL;
-	gchar* str = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = g_new0 (gchar, 7);
-#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	str = (gchar*) _tmp0_;
-#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = str;
-#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_unichar_to_utf8 (self, _tmp1_);
-#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = str;
-#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 1956 "book.c"
-}
-
-
-static guint8* _vala_array_dup1 (guint8* self, int length) {
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return g_memdup (self, length * sizeof (guint8));
-#line 1963 "book.c"
-}
-
-
-static guint8* _vala_array_dup2 (guint8* self, int length) {
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return g_memdup (self, length * sizeof (guint8));
-#line 1970 "book.c"
-}
-
-
-static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error) {
-	gchar* id = NULL;
-	gchar* _tmp0_ = NULL;
-	GFileOutputStream* stream = NULL;
-	GFile* _tmp9_ = NULL;
-	GFileOutputStream* _tmp10_ = NULL;
-	PDFWriter* writer = NULL;
-	PDFWriter* _tmp11_ = NULL;
-	guint catalog_number = 0U;
-	PDFWriter* _tmp12_ = NULL;
-	guint _tmp13_ = 0U;
-	guint metadata_number = 0U;
-	PDFWriter* _tmp14_ = NULL;
-	guint _tmp15_ = 0U;
-	guint pages_number = 0U;
-	PDFWriter* _tmp16_ = NULL;
-	guint _tmp17_ = 0U;
-	guint info_number = 0U;
-	PDFWriter* _tmp18_ = NULL;
-	guint _tmp19_ = 0U;
-	guint* page_numbers = NULL;
-	guint _tmp20_ = 0U;
-	guint _tmp21_ = 0U;
-	guint* _tmp22_ = NULL;
-	gint page_numbers_length1 = 0;
-	gint _page_numbers_size_ = 0;
-	guint* page_image_numbers = NULL;
-	guint _tmp23_ = 0U;
-	guint _tmp24_ = 0U;
-	guint* _tmp25_ = NULL;
-	gint page_image_numbers_length1 = 0;
-	gint _page_image_numbers_size_ = 0;
-	guint* page_content_numbers = NULL;
-	guint _tmp26_ = 0U;
-	guint _tmp27_ = 0U;
-	guint* _tmp28_ = NULL;
-	gint page_content_numbers_length1 = 0;
-	gint _page_content_numbers_size_ = 0;
-	guint struct_tree_root_number = 0U;
-	PDFWriter* _tmp49_ = NULL;
-	guint _tmp50_ = 0U;
-	PDFWriter* _tmp51_ = NULL;
-	PDFWriter* _tmp52_ = NULL;
-	PDFWriter* _tmp53_ = NULL;
-	guint _tmp54_ = 0U;
-	PDFWriter* _tmp55_ = NULL;
-	guint _tmp56_ = 0U;
-	gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	PDFWriter* _tmp59_ = NULL;
-	PDFWriter* _tmp60_ = NULL;
-	PDFWriter* _tmp61_ = NULL;
-	guint _tmp62_ = 0U;
-	gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	PDFWriter* _tmp65_ = NULL;
-	PDFWriter* _tmp66_ = NULL;
-	guint _tmp67_ = 0U;
-	gchar* _tmp68_ = NULL;
-	gchar* _tmp69_ = NULL;
-	PDFWriter* _tmp70_ = NULL;
-	guint _tmp71_ = 0U;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	PDFWriter* _tmp74_ = NULL;
-	PDFWriter* _tmp75_ = NULL;
-	GDateTime* now = NULL;
-	GDateTime* _tmp76_ = NULL;
-	gchar* date_string = NULL;
-	GDateTime* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
-	gchar* metadata = NULL;
-	gchar* _tmp79_ = NULL;
-	gchar* _tmp80_ = NULL;
-	const gchar* _tmp81_ = NULL;
-	const gchar* _tmp82_ = NULL;
-	const gchar* _tmp83_ = NULL;
-	gchar* _tmp84_ = NULL;
-	gchar* _tmp85_ = NULL;
-	PDFWriter* _tmp86_ = NULL;
-	PDFWriter* _tmp87_ = NULL;
-	guint _tmp88_ = 0U;
-	PDFWriter* _tmp89_ = NULL;
-	guint _tmp90_ = 0U;
-	gchar* _tmp91_ = NULL;
-	gchar* _tmp92_ = NULL;
-	PDFWriter* _tmp93_ = NULL;
-	PDFWriter* _tmp94_ = NULL;
-	PDFWriter* _tmp95_ = NULL;
-	PDFWriter* _tmp96_ = NULL;
-	const gchar* _tmp97_ = NULL;
-	gint _tmp98_ = 0;
-	gint _tmp99_ = 0;
-	gchar* _tmp100_ = NULL;
-	gchar* _tmp101_ = NULL;
-	PDFWriter* _tmp102_ = NULL;
-	PDFWriter* _tmp103_ = NULL;
-	PDFWriter* _tmp104_ = NULL;
-	const gchar* _tmp105_ = NULL;
-	PDFWriter* _tmp106_ = NULL;
-	PDFWriter* _tmp107_ = NULL;
-	PDFWriter* _tmp108_ = NULL;
-	PDFWriter* _tmp109_ = NULL;
-	PDFWriter* _tmp110_ = NULL;
-	guint _tmp111_ = 0U;
-	PDFWriter* _tmp112_ = NULL;
-	guint _tmp113_ = 0U;
-	gchar* _tmp114_ = NULL;
-	gchar* _tmp115_ = NULL;
-	PDFWriter* _tmp116_ = NULL;
-	PDFWriter* _tmp117_ = NULL;
-	PDFWriter* _tmp118_ = NULL;
-	PDFWriter* _tmp130_ = NULL;
-	PDFWriter* _tmp131_ = NULL;
-	guint _tmp132_ = 0U;
-	guint _tmp133_ = 0U;
-	gchar* _tmp134_ = NULL;
-	gchar* _tmp135_ = NULL;
-	PDFWriter* _tmp136_ = NULL;
-	PDFWriter* _tmp137_ = NULL;
-	PDFWriter* _tmp475_ = NULL;
-	PDFWriter* _tmp476_ = NULL;
-	guint _tmp477_ = 0U;
-	PDFWriter* _tmp478_ = NULL;
-	guint _tmp479_ = 0U;
-	gchar* _tmp480_ = NULL;
-	gchar* _tmp481_ = NULL;
-	PDFWriter* _tmp482_ = NULL;
-	PDFWriter* _tmp483_ = NULL;
-	gchar* _tmp484_ = NULL;
-	gchar* _tmp485_ = NULL;
-	PDFWriter* _tmp486_ = NULL;
-	PDFWriter* _tmp487_ = NULL;
-	PDFWriter* _tmp488_ = NULL;
-	gsize xref_offset = 0UL;
-	PDFWriter* _tmp489_ = NULL;
-	gsize _tmp490_ = 0UL;
-	PDFWriter* _tmp491_ = NULL;
-	PDFWriter* _tmp492_ = NULL;
-	PDFWriter* _tmp493_ = NULL;
-	guint* _tmp494_ = NULL;
-	gint _tmp494__length1 = 0;
-	gchar* _tmp495_ = NULL;
-	gchar* _tmp496_ = NULL;
-	PDFWriter* _tmp497_ = NULL;
-	PDFWriter* _tmp498_ = NULL;
-	gint _tmp499_ = 0;
-	gchar* _tmp500_ = NULL;
-	gchar* _tmp501_ = NULL;
-	PDFWriter* _tmp524_ = NULL;
-	PDFWriter* _tmp525_ = NULL;
-	PDFWriter* _tmp526_ = NULL;
-	PDFWriter* _tmp527_ = NULL;
-	PDFWriter* _tmp528_ = NULL;
-	guint* _tmp529_ = NULL;
-	gint _tmp529__length1 = 0;
-	gchar* _tmp530_ = NULL;
-	gchar* _tmp531_ = NULL;
-	PDFWriter* _tmp532_ = NULL;
-	guint _tmp533_ = 0U;
-	gchar* _tmp534_ = NULL;
-	gchar* _tmp535_ = NULL;
-	PDFWriter* _tmp536_ = NULL;
-	guint _tmp537_ = 0U;
-	gchar* _tmp538_ = NULL;
-	gchar* _tmp539_ = NULL;
-	PDFWriter* _tmp540_ = NULL;
-	const gchar* _tmp541_ = NULL;
-	const gchar* _tmp542_ = NULL;
-	gchar* _tmp543_ = NULL;
-	gchar* _tmp544_ = NULL;
-	PDFWriter* _tmp545_ = NULL;
-	PDFWriter* _tmp546_ = NULL;
-	PDFWriter* _tmp547_ = NULL;
-	gsize _tmp548_ = 0UL;
-	gchar* _tmp549_ = NULL;
-	gchar* _tmp550_ = NULL;
-	PDFWriter* _tmp551_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (file != NULL);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = g_strdup ("");
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	id = _tmp0_;
-#line 2161 "book.c"
-	{
-		gint i = 0;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 2166 "book.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp1_ = TRUE;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 2173 "book.c"
-				gint _tmp3_ = 0;
-				const gchar* _tmp4_ = NULL;
-				guint32 _tmp5_ = 0U;
-				gchar* _tmp6_ = NULL;
-				gchar* _tmp7_ = NULL;
-				gchar* _tmp8_ = NULL;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp1_) {
-#line 2182 "book.c"
-					gint _tmp2_ = 0;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp2_ = i;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp2_ + 1;
-#line 2188 "book.c"
-				}
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp1_ = FALSE;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp3_ = i;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(_tmp3_ < 4)) {
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 2198 "book.c"
-				}
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp4_ = id;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp5_ = g_random_int ();
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp6_ = g_strdup_printf ("%08x", (guint) _tmp5_);
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp7_ = _tmp6_;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp8_ = g_strconcat (_tmp4_, _tmp7_, NULL);
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (id);
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				id = _tmp8_;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp7_);
-#line 2216 "book.c"
-			}
-		}
-	}
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp9_ = file;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp10_ = g_file_replace (_tmp9_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	stream = _tmp10_;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_propagate_error (error, _inner_error_);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_g_free0 (id);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return;
-#line 2234 "book.c"
-	}
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp11_ = pdf_writer_new (stream);
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	writer = _tmp11_;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp12_ = writer;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp13_ = pdf_writer_add_object (_tmp12_);
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	catalog_number = _tmp13_;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp14_ = writer;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp15_ = pdf_writer_add_object (_tmp14_);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	metadata_number = _tmp15_;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp16_ = writer;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp17_ = pdf_writer_add_object (_tmp16_);
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pages_number = _tmp17_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp18_ = writer;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp19_ = pdf_writer_add_object (_tmp18_);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	info_number = _tmp19_;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp20_ = book_get_n_pages (self);
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp21_ = _tmp20_;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp22_ = g_new0 (guint, _tmp21_);
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page_numbers = _tmp22_;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page_numbers_length1 = _tmp21_;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_page_numbers_size_ = page_numbers_length1;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp23_ = book_get_n_pages (self);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp24_ = _tmp23_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp25_ = g_new0 (guint, _tmp24_);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page_image_numbers = _tmp25_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page_image_numbers_length1 = _tmp24_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_page_image_numbers_size_ = page_image_numbers_length1;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp26_ = book_get_n_pages (self);
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp27_ = _tmp26_;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp28_ = g_new0 (guint, _tmp27_);
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page_content_numbers = _tmp28_;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page_content_numbers_length1 = _tmp27_;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_page_content_numbers_size_ = page_content_numbers_length1;
-#line 2300 "book.c"
-	{
-		gint i = 0;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 2305 "book.c"
-		{
-			gboolean _tmp29_ = FALSE;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp29_ = TRUE;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 2312 "book.c"
-				gint _tmp31_ = 0;
-				guint _tmp32_ = 0U;
-				guint _tmp33_ = 0U;
-				guint* _tmp34_ = NULL;
-				gint _tmp34__length1 = 0;
-				gint _tmp35_ = 0;
-				PDFWriter* _tmp36_ = NULL;
-				guint _tmp37_ = 0U;
-				guint _tmp38_ = 0U;
-				guint* _tmp39_ = NULL;
-				gint _tmp39__length1 = 0;
-				gint _tmp40_ = 0;
-				PDFWriter* _tmp41_ = NULL;
-				guint _tmp42_ = 0U;
-				guint _tmp43_ = 0U;
-				guint* _tmp44_ = NULL;
-				gint _tmp44__length1 = 0;
-				gint _tmp45_ = 0;
-				PDFWriter* _tmp46_ = NULL;
-				guint _tmp47_ = 0U;
-				guint _tmp48_ = 0U;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp29_) {
-#line 2336 "book.c"
-					gint _tmp30_ = 0;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp30_ = i;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp30_ + 1;
-#line 2342 "book.c"
-				}
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp29_ = FALSE;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp31_ = i;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp32_ = book_get_n_pages (self);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp33_ = _tmp32_;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp31_) < _tmp33_)) {
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 2356 "book.c"
-				}
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp34_ = page_numbers;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp34__length1 = page_numbers_length1;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp35_ = i;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp36_ = writer;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp37_ = pdf_writer_add_object (_tmp36_);
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp34_[_tmp35_] = _tmp37_;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp38_ = _tmp34_[_tmp35_];
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp39_ = page_image_numbers;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp39__length1 = page_image_numbers_length1;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp40_ = i;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp41_ = writer;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp42_ = pdf_writer_add_object (_tmp41_);
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp39_[_tmp40_] = _tmp42_;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp43_ = _tmp39_[_tmp40_];
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp44_ = page_content_numbers;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp44__length1 = page_content_numbers_length1;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp45_ = i;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp46_ = writer;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp47_ = pdf_writer_add_object (_tmp46_);
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp44_[_tmp45_] = _tmp47_;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp48_ = _tmp44_[_tmp45_];
-#line 2400 "book.c"
-			}
-		}
-	}
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp49_ = writer;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp50_ = pdf_writer_add_object (_tmp49_);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	struct_tree_root_number = _tmp50_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp51_ = writer;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp51_, "%PDF-1.3\n");
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp52_ = writer;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp52_, "%\xe2\xe3\xcf\xd3\n");
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp53_ = writer;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp54_ = catalog_number;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_start_object (_tmp53_, _tmp54_);
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp55_ = writer;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp56_ = catalog_number;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp57_ = g_strdup_printf ("%u 0 obj\n", _tmp56_);
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp58_ = _tmp57_;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp55_, _tmp58_);
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp58_);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp59_ = writer;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp59_, "<<\n");
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp60_ = writer;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp60_, "/Type /Catalog\n");
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp61_ = writer;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp62_ = metadata_number;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp63_ = g_strdup_printf ("/Metadata %u 0 R\n", _tmp62_);
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp64_ = _tmp63_;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp61_, _tmp64_);
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp64_);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp65_ = writer;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp65_, "/MarkInfo << /Marked true >>\n");
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp66_ = writer;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp67_ = struct_tree_root_number;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp68_ = g_strdup_printf ("/StructTreeRoot %u 0 R\n", _tmp67_);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp69_ = _tmp68_;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp66_, _tmp69_);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp69_);
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp70_ = writer;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp71_ = pages_number;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp72_ = g_strdup_printf ("/Pages %u 0 R\n", _tmp71_);
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp73_ = _tmp72_;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp70_, _tmp73_);
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp73_);
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp74_ = writer;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp74_, ">>\n");
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp75_ = writer;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp75_, "endobj\n");
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp76_ = g_date_time_new_now_local ();
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	now = _tmp76_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp77_ = now;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp78_ = g_date_time_format (_tmp77_, "%FT%H:%M:%S%:z");
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	date_string = _tmp78_;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp79_ = g_unichar_to_string ((gunichar) 0xFEFF);
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp80_ = _tmp79_;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp81_ = date_string;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp82_ = date_string;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp83_ = date_string;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp84_ = g_strdup_printf ("<?xpacket begin=\"%s\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n" \
-"<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n" \
-"         xmlns:xmp=\"http://ns.adobe.com/xap/1.0/\">\n" \
-"  <rdf:Description rdf:about=\"\"\n" \
-"                   xmlns:pdfaid=\"http://www.aiim.org/pdfa/ns/id/\"\n" \
-"                   xmlns:xmp=\"http://ns.adobe.com/xap/1.0/\">\n" \
-"    <pdfaid:part>1</pdfaid:part>\n" \
-"    <pdfaid:conformance>A</pdfaid:conformance>\n" \
-"    <xmp:CreatorTool>Simple Scan %s</xmp:CreatorTool>\n" \
-"    <xmp:CreateDate>%s</xmp:CreateDate>\n" \
-"    <xmp:ModifyDate>%s</xmp:ModifyDate>\n" \
-"    <xmp:MetadataDate>%s</xmp:MetadataDate>\n" \
-"  </rdf:Description>\n" \
-"</rdf:RDF>\n" \
-"<?xpacket end=\"w\"?>", _tmp80_, VERSION, _tmp81_, _tmp82_, _tmp83_);
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp85_ = _tmp84_;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp80_);
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	metadata = _tmp85_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp86_ = writer;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp86_, "\n");
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp87_ = writer;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp88_ = metadata_number;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_start_object (_tmp87_, _tmp88_);
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp89_ = writer;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp90_ = metadata_number;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp91_ = g_strdup_printf ("%u 0 obj\n", _tmp90_);
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp92_ = _tmp91_;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp89_, _tmp92_);
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp92_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp93_ = writer;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp93_, "<<\n");
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp94_ = writer;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp94_, "/Type /Metadata\n");
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp95_ = writer;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp95_, "/Subtype /XML\n");
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp96_ = writer;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp97_ = metadata;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp98_ = strlen (_tmp97_);
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp99_ = _tmp98_;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp100_ = g_strdup_printf ("/Length %u\n", (guint) _tmp99_);
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp101_ = _tmp100_;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp96_, _tmp101_);
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp101_);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp102_ = writer;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp102_, ">>\n");
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp103_ = writer;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp103_, "stream\n");
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp104_ = writer;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp105_ = metadata;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp104_, _tmp105_);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp106_ = writer;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp106_, "\n");
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp107_ = writer;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp107_, "endstream\n");
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp108_ = writer;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp108_, "endobj\n");
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp109_ = writer;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp109_, "\n");
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp110_ = writer;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp111_ = pages_number;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_start_object (_tmp110_, _tmp111_);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp112_ = writer;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp113_ = pages_number;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp114_ = g_strdup_printf ("%u 0 obj\n", _tmp113_);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp115_ = _tmp114_;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp112_, _tmp115_);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp115_);
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp116_ = writer;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp116_, "<<\n");
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp117_ = writer;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp117_, "/Type /Pages\n");
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp118_ = writer;
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp118_, "/Kids [");
-#line 2630 "book.c"
-	{
-		gint i = 0;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 2635 "book.c"
-		{
-			gboolean _tmp119_ = FALSE;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp119_ = TRUE;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 2642 "book.c"
-				gint _tmp121_ = 0;
-				guint _tmp122_ = 0U;
-				guint _tmp123_ = 0U;
-				PDFWriter* _tmp124_ = NULL;
-				guint* _tmp125_ = NULL;
-				gint _tmp125__length1 = 0;
-				gint _tmp126_ = 0;
-				guint _tmp127_ = 0U;
-				gchar* _tmp128_ = NULL;
-				gchar* _tmp129_ = NULL;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp119_) {
-#line 2655 "book.c"
-					gint _tmp120_ = 0;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp120_ = i;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp120_ + 1;
-#line 2661 "book.c"
-				}
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp119_ = FALSE;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp121_ = i;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp122_ = book_get_n_pages (self);
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp123_ = _tmp122_;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp121_) < _tmp123_)) {
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 2675 "book.c"
-				}
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp124_ = writer;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp125_ = page_numbers;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp125__length1 = page_numbers_length1;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp126_ = i;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp127_ = _tmp125_[_tmp126_];
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp128_ = g_strdup_printf (" %u 0 R", _tmp127_);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp129_ = _tmp128_;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp124_, _tmp129_);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp129_);
-#line 2695 "book.c"
-			}
-		}
-	}
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp130_ = writer;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp130_, " ]\n");
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp131_ = writer;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp132_ = book_get_n_pages (self);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp133_ = _tmp132_;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp134_ = g_strdup_printf ("/Count %u\n", _tmp133_);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp135_ = _tmp134_;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp131_, _tmp135_);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp135_);
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp136_ = writer;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp136_, ">>\n");
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp137_ = writer;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp137_, "endobj\n");
-#line 2725 "book.c"
-	{
-		gint i = 0;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 2730 "book.c"
-		{
-			gboolean _tmp138_ = FALSE;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp138_ = TRUE;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 2737 "book.c"
-				gint _tmp140_ = 0;
-				guint _tmp141_ = 0U;
-				guint _tmp142_ = 0U;
-				Page* page = NULL;
-				gint _tmp143_ = 0;
-				Page* _tmp144_ = NULL;
-				GdkPixbuf* image = NULL;
-				Page* _tmp145_ = NULL;
-				GdkPixbuf* _tmp146_ = NULL;
-				gint width = 0;
-				GdkPixbuf* _tmp147_ = NULL;
-				gint _tmp148_ = 0;
-				gint _tmp149_ = 0;
-				gint height = 0;
-				GdkPixbuf* _tmp150_ = NULL;
-				gint _tmp151_ = 0;
-				gint _tmp152_ = 0;
-				guint8* pixels = NULL;
-				GdkPixbuf* _tmp153_ = NULL;
-				guint8* _tmp154_ = NULL;
-				gint pixels_length1 = 0;
-				gint _pixels_size_ = 0;
-				gdouble page_width = 0.0;
-				gint _tmp155_ = 0;
-				Page* _tmp156_ = NULL;
-				gint _tmp157_ = 0;
-				gint _tmp158_ = 0;
-				gdouble page_height = 0.0;
-				gint _tmp159_ = 0;
-				Page* _tmp160_ = NULL;
-				gint _tmp161_ = 0;
-				gint _tmp162_ = 0;
-				gint depth = 0;
-				gchar* color_space = NULL;
-				gchar* _tmp163_ = NULL;
-				gchar* filter = NULL;
-				gchar* width_buffer = NULL;
-				gchar* _tmp164_ = NULL;
-				gint width_buffer_length1 = 0;
-				gint _width_buffer_size_ = 0;
-				gchar* height_buffer = NULL;
-				gchar* _tmp165_ = NULL;
-				gint height_buffer_length1 = 0;
-				gint _height_buffer_size_ = 0;
-				guint8* data = NULL;
-				gint data_length1 = 0;
-				gint _data_size_ = 0;
-				Page* _tmp166_ = NULL;
-				gboolean _tmp167_ = FALSE;
-				gboolean _tmp168_ = FALSE;
-				guint8* compressed_data = NULL;
-				guint8* _tmp322_ = NULL;
-				gint _tmp322__length1 = 0;
-				gint _tmp323_ = 0;
-				guint8* _tmp324_ = NULL;
-				gint compressed_data_length1 = 0;
-				gint _compressed_data_size_ = 0;
-				guint8* _tmp325_ = NULL;
-				gint _tmp325__length1 = 0;
-				PDFWriter* _tmp343_ = NULL;
-				PDFWriter* _tmp344_ = NULL;
-				guint* _tmp345_ = NULL;
-				gint _tmp345__length1 = 0;
-				gint _tmp346_ = 0;
-				guint _tmp347_ = 0U;
-				PDFWriter* _tmp348_ = NULL;
-				guint* _tmp349_ = NULL;
-				gint _tmp349__length1 = 0;
-				gint _tmp350_ = 0;
-				guint _tmp351_ = 0U;
-				gchar* _tmp352_ = NULL;
-				gchar* _tmp353_ = NULL;
-				PDFWriter* _tmp354_ = NULL;
-				PDFWriter* _tmp355_ = NULL;
-				PDFWriter* _tmp356_ = NULL;
-				guint _tmp357_ = 0U;
-				gchar* _tmp358_ = NULL;
-				gchar* _tmp359_ = NULL;
-				PDFWriter* _tmp360_ = NULL;
-				gint _tmp361_ = 0;
-				guint* _tmp362_ = NULL;
-				gint _tmp362__length1 = 0;
-				gint _tmp363_ = 0;
-				guint _tmp364_ = 0U;
-				gchar* _tmp365_ = NULL;
-				gchar* _tmp366_ = NULL;
-				PDFWriter* _tmp367_ = NULL;
-				gdouble _tmp368_ = 0.0;
-				gchar* _tmp369_ = NULL;
-				gint _tmp369__length1 = 0;
-				const gchar* _tmp370_ = NULL;
-				gdouble _tmp371_ = 0.0;
-				gchar* _tmp372_ = NULL;
-				gint _tmp372__length1 = 0;
-				const gchar* _tmp373_ = NULL;
-				gchar* _tmp374_ = NULL;
-				gchar* _tmp375_ = NULL;
-				PDFWriter* _tmp376_ = NULL;
-				guint* _tmp377_ = NULL;
-				gint _tmp377__length1 = 0;
-				gint _tmp378_ = 0;
-				guint _tmp379_ = 0U;
-				gchar* _tmp380_ = NULL;
-				gchar* _tmp381_ = NULL;
-				PDFWriter* _tmp382_ = NULL;
-				PDFWriter* _tmp383_ = NULL;
-				PDFWriter* _tmp384_ = NULL;
-				PDFWriter* _tmp385_ = NULL;
-				guint* _tmp386_ = NULL;
-				gint _tmp386__length1 = 0;
-				gint _tmp387_ = 0;
-				guint _tmp388_ = 0U;
-				PDFWriter* _tmp389_ = NULL;
-				guint* _tmp390_ = NULL;
-				gint _tmp390__length1 = 0;
-				gint _tmp391_ = 0;
-				guint _tmp392_ = 0U;
-				gchar* _tmp393_ = NULL;
-				gchar* _tmp394_ = NULL;
-				PDFWriter* _tmp395_ = NULL;
-				PDFWriter* _tmp396_ = NULL;
-				PDFWriter* _tmp397_ = NULL;
-				PDFWriter* _tmp398_ = NULL;
-				gint _tmp399_ = 0;
-				gchar* _tmp400_ = NULL;
-				gchar* _tmp401_ = NULL;
-				PDFWriter* _tmp402_ = NULL;
-				gint _tmp403_ = 0;
-				gchar* _tmp404_ = NULL;
-				gchar* _tmp405_ = NULL;
-				PDFWriter* _tmp406_ = NULL;
-				const gchar* _tmp407_ = NULL;
-				gchar* _tmp408_ = NULL;
-				gchar* _tmp409_ = NULL;
-				PDFWriter* _tmp410_ = NULL;
-				gint _tmp411_ = 0;
-				gchar* _tmp412_ = NULL;
-				gchar* _tmp413_ = NULL;
-				PDFWriter* _tmp414_ = NULL;
-				guint8* _tmp415_ = NULL;
-				gint _tmp415__length1 = 0;
-				gchar* _tmp416_ = NULL;
-				gchar* _tmp417_ = NULL;
-				const gchar* _tmp418_ = NULL;
-				PDFWriter* _tmp423_ = NULL;
-				PDFWriter* _tmp424_ = NULL;
-				PDFWriter* _tmp425_ = NULL;
-				guint8* _tmp426_ = NULL;
-				gint _tmp426__length1 = 0;
-				PDFWriter* _tmp427_ = NULL;
-				PDFWriter* _tmp428_ = NULL;
-				PDFWriter* _tmp429_ = NULL;
-				PDFWriter* _tmp430_ = NULL;
-				PDFWriter* _tmp431_ = NULL;
-				guint _tmp432_ = 0U;
-				PDFWriter* _tmp433_ = NULL;
-				guint _tmp434_ = 0U;
-				gchar* _tmp435_ = NULL;
-				gchar* _tmp436_ = NULL;
-				PDFWriter* _tmp437_ = NULL;
-				PDFWriter* _tmp438_ = NULL;
-				PDFWriter* _tmp439_ = NULL;
-				PDFWriter* _tmp440_ = NULL;
-				gchar* command = NULL;
-				gdouble _tmp441_ = 0.0;
-				gchar* _tmp442_ = NULL;
-				gint _tmp442__length1 = 0;
-				const gchar* _tmp443_ = NULL;
-				gdouble _tmp444_ = 0.0;
-				gchar* _tmp445_ = NULL;
-				gint _tmp445__length1 = 0;
-				const gchar* _tmp446_ = NULL;
-				gint _tmp447_ = 0;
-				gchar* _tmp448_ = NULL;
-				PDFWriter* _tmp449_ = NULL;
-				PDFWriter* _tmp450_ = NULL;
-				guint* _tmp451_ = NULL;
-				gint _tmp451__length1 = 0;
-				gint _tmp452_ = 0;
-				guint _tmp453_ = 0U;
-				PDFWriter* _tmp454_ = NULL;
-				guint* _tmp455_ = NULL;
-				gint _tmp455__length1 = 0;
-				gint _tmp456_ = 0;
-				guint _tmp457_ = 0U;
-				gchar* _tmp458_ = NULL;
-				gchar* _tmp459_ = NULL;
-				PDFWriter* _tmp460_ = NULL;
-				PDFWriter* _tmp461_ = NULL;
-				const gchar* _tmp462_ = NULL;
-				gint _tmp463_ = 0;
-				gint _tmp464_ = 0;
-				gchar* _tmp465_ = NULL;
-				gchar* _tmp466_ = NULL;
-				PDFWriter* _tmp467_ = NULL;
-				PDFWriter* _tmp468_ = NULL;
-				PDFWriter* _tmp469_ = NULL;
-				const gchar* _tmp470_ = NULL;
-				PDFWriter* _tmp471_ = NULL;
-				PDFWriter* _tmp472_ = NULL;
-				PDFWriter* _tmp473_ = NULL;
-				gint _tmp474_ = 0;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp138_) {
-#line 2942 "book.c"
-					gint _tmp139_ = 0;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp139_ = i;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp139_ + 1;
-#line 2948 "book.c"
-				}
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp138_ = FALSE;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp140_ = i;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp141_ = book_get_n_pages (self);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp142_ = _tmp141_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp140_) < _tmp142_)) {
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 2962 "book.c"
-				}
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp143_ = i;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp144_ = book_get_page (self, _tmp143_);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp144_;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp145_ = page;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp146_ = page_get_image (_tmp145_, TRUE);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				image = _tmp146_;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp147_ = image;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp148_ = gdk_pixbuf_get_width (_tmp147_);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp149_ = _tmp148_;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width = _tmp149_;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp150_ = image;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp151_ = gdk_pixbuf_get_height (_tmp150_);
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp152_ = _tmp151_;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height = _tmp152_;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp153_ = image;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp154_ = gdk_pixbuf_get_pixels (_tmp153_);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pixels = _tmp154_;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pixels_length1 = -1;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_pixels_size_ = pixels_length1;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp155_ = width;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp156_ = page;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp157_ = page_get_dpi (_tmp156_);
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp158_ = _tmp157_;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_width = (_tmp155_ * 72.0) / _tmp158_;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp159_ = height;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp160_ = page;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp161_ = page_get_dpi (_tmp160_);
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp162_ = _tmp161_;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_height = (_tmp159_ * 72.0) / _tmp162_;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				depth = 8;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp163_ = g_strdup ("DeviceRGB");
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				color_space = _tmp163_;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				filter = NULL;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp164_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer = _tmp164_;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_width_buffer_size_ = width_buffer_length1;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp165_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height_buffer = _tmp165_;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_height_buffer_size_ = height_buffer_length1;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp166_ = page;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp167_ = page_get_is_color (_tmp166_);
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp168_ = _tmp167_;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp168_) {
-#line 3054 "book.c"
-					gchar* _tmp169_ = NULL;
-					gint data_length = 0;
-					gint _tmp170_ = 0;
-					gint _tmp171_ = 0;
-					gint _tmp172_ = 0;
-					guint8* _tmp173_ = NULL;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					depth = 8;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp169_ = g_strdup ("DeviceRGB");
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_g_free0 (color_space);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					color_space = _tmp169_;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp170_ = height;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp171_ = width;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data_length = (_tmp170_ * _tmp171_) * 3;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp172_ = data_length;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp173_ = g_new0 (guint8, _tmp172_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data = (g_free (data), NULL);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data = _tmp173_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data_length1 = _tmp172_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_data_size_ = data_length1;
-#line 3087 "book.c"
-					{
-						gint row = 0;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						row = 0;
-#line 3092 "book.c"
-						{
-							gboolean _tmp174_ = FALSE;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp174_ = TRUE;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							while (TRUE) {
-#line 3099 "book.c"
-								gint _tmp176_ = 0;
-								gint _tmp177_ = 0;
-								gint in_offset = 0;
-								gint _tmp178_ = 0;
-								GdkPixbuf* _tmp179_ = NULL;
-								gint _tmp180_ = 0;
-								gint _tmp181_ = 0;
-								gint out_offset = 0;
-								gint _tmp182_ = 0;
-								gint _tmp183_ = 0;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								if (!_tmp174_) {
-#line 3112 "book.c"
-									gint _tmp175_ = 0;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp175_ = row;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									row = _tmp175_ + 1;
-#line 3118 "book.c"
-								}
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp174_ = FALSE;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp176_ = row;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp177_ = height;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								if (!(_tmp176_ < _tmp177_)) {
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									break;
-#line 3130 "book.c"
-								}
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp178_ = row;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp179_ = image;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp180_ = gdk_pixbuf_get_rowstride (_tmp179_);
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp181_ = _tmp180_;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								in_offset = _tmp178_ * _tmp181_;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp182_ = row;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp183_ = width;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								out_offset = (_tmp182_ * _tmp183_) * 3;
-#line 3148 "book.c"
-								{
-									gint x = 0;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									x = 0;
-#line 3153 "book.c"
-									{
-										gboolean _tmp184_ = FALSE;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp184_ = TRUE;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										while (TRUE) {
-#line 3160 "book.c"
-											gint _tmp186_ = 0;
-											gint _tmp187_ = 0;
-											gint in_o = 0;
-											gint _tmp188_ = 0;
-											gint _tmp189_ = 0;
-											gint out_o = 0;
-											gint _tmp190_ = 0;
-											gint _tmp191_ = 0;
-											guint8* _tmp192_ = NULL;
-											gint _tmp192__length1 = 0;
-											gint _tmp193_ = 0;
-											guint8* _tmp194_ = NULL;
-											gint _tmp194__length1 = 0;
-											gint _tmp195_ = 0;
-											guint8 _tmp196_ = 0U;
-											guint8 _tmp197_ = 0U;
-											guint8* _tmp198_ = NULL;
-											gint _tmp198__length1 = 0;
-											gint _tmp199_ = 0;
-											guint8* _tmp200_ = NULL;
-											gint _tmp200__length1 = 0;
-											gint _tmp201_ = 0;
-											guint8 _tmp202_ = 0U;
-											guint8 _tmp203_ = 0U;
-											guint8* _tmp204_ = NULL;
-											gint _tmp204__length1 = 0;
-											gint _tmp205_ = 0;
-											guint8* _tmp206_ = NULL;
-											gint _tmp206__length1 = 0;
-											gint _tmp207_ = 0;
-											guint8 _tmp208_ = 0U;
-											guint8 _tmp209_ = 0U;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											if (!_tmp184_) {
-#line 3195 "book.c"
-												gint _tmp185_ = 0;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp185_ = x;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												x = _tmp185_ + 1;
-#line 3201 "book.c"
-											}
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp184_ = FALSE;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp186_ = x;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp187_ = width;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											if (!(_tmp186_ < _tmp187_)) {
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												break;
-#line 3213 "book.c"
-											}
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp188_ = in_offset;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp189_ = x;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											in_o = _tmp188_ + (_tmp189_ * 3);
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp190_ = out_offset;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp191_ = x;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											out_o = _tmp190_ + (_tmp191_ * 3);
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp192_ = data;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp192__length1 = data_length1;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp193_ = out_o;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp194_ = pixels;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp194__length1 = pixels_length1;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp195_ = in_o;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp196_ = _tmp194_[_tmp195_];
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp192_[_tmp193_] = _tmp196_;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp197_ = _tmp192_[_tmp193_];
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp198_ = data;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp198__length1 = data_length1;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp199_ = out_o;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp200_ = pixels;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp200__length1 = pixels_length1;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp201_ = in_o;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp202_ = _tmp200_[_tmp201_ + 1];
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp198_[_tmp199_ + 1] = _tmp202_;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp203_ = _tmp198_[_tmp199_ + 1];
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp204_ = data;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp204__length1 = data_length1;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp205_ = out_o;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp206_ = pixels;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp206__length1 = pixels_length1;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp207_ = in_o;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp208_ = _tmp206_[_tmp207_ + 2];
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp204_[_tmp205_ + 2] = _tmp208_;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp209_ = _tmp204_[_tmp205_ + 2];
-#line 3281 "book.c"
-										}
-									}
-								}
-							}
-						}
-					}
-				} else {
-					Page* _tmp210_ = NULL;
-					gint _tmp211_ = 0;
-					gint _tmp212_ = 0;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp210_ = page;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp211_ = page_get_depth (_tmp210_);
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp212_ = _tmp211_;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp212_ == 2) {
-#line 3300 "book.c"
-						gint shift_count = 0;
-						gchar* _tmp213_ = NULL;
-						gint data_length = 0;
-						gint _tmp214_ = 0;
-						gint _tmp215_ = 0;
-						gint _tmp216_ = 0;
-						guint8* _tmp217_ = NULL;
-						gint offset = 0;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						shift_count = 6;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						depth = 2;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp213_ = g_strdup ("DeviceGray");
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_g_free0 (color_space);
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						color_space = _tmp213_;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp214_ = height;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp215_ = width;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length = _tmp214_ * (((_tmp215_ * 2) + 7) / 8);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp216_ = data_length;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp217_ = g_new0 (guint8, _tmp216_);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = (g_free (data), NULL);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = _tmp217_;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length1 = _tmp216_;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_data_size_ = data_length1;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						offset = 0;
-#line 3339 "book.c"
-						{
-							gint row = 0;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							row = 0;
-#line 3344 "book.c"
-							{
-								gboolean _tmp218_ = FALSE;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp218_ = TRUE;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								while (TRUE) {
-#line 3351 "book.c"
-									gint _tmp220_ = 0;
-									gint _tmp221_ = 0;
-									gint _tmp222_ = 0;
-									gint in_offset = 0;
-									gint _tmp224_ = 0;
-									GdkPixbuf* _tmp225_ = NULL;
-									gint _tmp226_ = 0;
-									gint _tmp227_ = 0;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (!_tmp218_) {
-#line 3362 "book.c"
-										gint _tmp219_ = 0;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp219_ = row;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										row = _tmp219_ + 1;
-#line 3368 "book.c"
-									}
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp218_ = FALSE;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp220_ = row;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp221_ = height;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (!(_tmp220_ < _tmp221_)) {
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										break;
-#line 3380 "book.c"
-									}
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp222_ = shift_count;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (_tmp222_ != 6) {
-#line 3386 "book.c"
-										gint _tmp223_ = 0;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp223_ = offset;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										offset = _tmp223_ + 1;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										shift_count = 6;
-#line 3394 "book.c"
-									}
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp224_ = row;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp225_ = image;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp226_ = gdk_pixbuf_get_rowstride (_tmp225_);
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp227_ = _tmp226_;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									in_offset = _tmp224_ * _tmp227_;
-#line 3406 "book.c"
-									{
-										gint x = 0;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										x = 0;
-#line 3411 "book.c"
-										{
-											gboolean _tmp228_ = FALSE;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp228_ = TRUE;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											while (TRUE) {
-#line 3418 "book.c"
-												gint _tmp230_ = 0;
-												gint _tmp231_ = 0;
-												gint _tmp232_ = 0;
-												guint8 p = 0U;
-												guint8* _tmp236_ = NULL;
-												gint _tmp236__length1 = 0;
-												gint _tmp237_ = 0;
-												gint _tmp238_ = 0;
-												guint8 _tmp239_ = 0U;
-												guint8 _tmp240_ = 0U;
-												gint _tmp255_ = 0;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (!_tmp228_) {
-#line 3432 "book.c"
-													gint _tmp229_ = 0;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp229_ = x;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													x = _tmp229_ + 1;
-#line 3438 "book.c"
-												}
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp228_ = FALSE;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp230_ = x;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp231_ = width;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (!(_tmp230_ < _tmp231_)) {
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													break;
-#line 3450 "book.c"
-												}
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp232_ = shift_count;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (_tmp232_ == 6) {
-#line 3456 "book.c"
-													guint8* _tmp233_ = NULL;
-													gint _tmp233__length1 = 0;
-													gint _tmp234_ = 0;
-													guint8 _tmp235_ = 0U;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp233_ = data;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp233__length1 = data_length1;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp234_ = offset;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp233_[_tmp234_] = (guint8) 0;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp235_ = _tmp233_[_tmp234_];
-#line 3471 "book.c"
-												}
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp236_ = pixels;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp236__length1 = pixels_length1;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp237_ = in_offset;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp238_ = x;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp239_ = _tmp236_[_tmp237_ + (_tmp238_ * 3)];
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												p = _tmp239_;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp240_ = p;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (((gint) _tmp240_) >= 192) {
-#line 3489 "book.c"
-													guint8* _tmp241_ = NULL;
-													gint _tmp241__length1 = 0;
-													gint _tmp242_ = 0;
-													gint _tmp243_ = 0;
-													guint8 _tmp244_ = 0U;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp241_ = data;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp241__length1 = data_length1;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp242_ = offset;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp243_ = shift_count;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp241_[_tmp242_] |= (guint8) (3 << _tmp243_);
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp244_ = _tmp241_[_tmp242_];
-#line 3507 "book.c"
-												} else {
-													guint8 _tmp245_ = 0U;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp245_ = p;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (((gint) _tmp245_) >= 128) {
-#line 3514 "book.c"
-														guint8* _tmp246_ = NULL;
-														gint _tmp246__length1 = 0;
-														gint _tmp247_ = 0;
-														gint _tmp248_ = 0;
-														guint8 _tmp249_ = 0U;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp246_ = data;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp246__length1 = data_length1;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp247_ = offset;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp248_ = shift_count;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp246_[_tmp247_] |= (guint8) (2 << _tmp248_);
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp249_ = _tmp246_[_tmp247_];
-#line 3532 "book.c"
-													} else {
-														guint8 _tmp250_ = 0U;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp250_ = p;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														if (((gint) _tmp250_) >= 64) {
-#line 3539 "book.c"
-															guint8* _tmp251_ = NULL;
-															gint _tmp251__length1 = 0;
-															gint _tmp252_ = 0;
-															gint _tmp253_ = 0;
-															guint8 _tmp254_ = 0U;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp251_ = data;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp251__length1 = data_length1;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp252_ = offset;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp253_ = shift_count;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp251_[_tmp252_] |= (guint8) (1 << _tmp253_);
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp254_ = _tmp251_[_tmp252_];
-#line 3557 "book.c"
-														}
-													}
-												}
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp255_ = shift_count;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (_tmp255_ == 0) {
-#line 3565 "book.c"
-													gint _tmp256_ = 0;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp256_ = offset;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													offset = _tmp256_ + 1;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													shift_count = 6;
-#line 3573 "book.c"
-												} else {
-													gint _tmp257_ = 0;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp257_ = shift_count;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													shift_count = _tmp257_ - 2;
-#line 3580 "book.c"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					} else {
-						Page* _tmp258_ = NULL;
-						gint _tmp259_ = 0;
-						gint _tmp260_ = 0;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp258_ = page;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp259_ = page_get_depth (_tmp258_);
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp260_ = _tmp259_;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						if (_tmp260_ == 1) {
-#line 3600 "book.c"
-							gint mask = 0;
-							gchar* _tmp261_ = NULL;
-							gint data_length = 0;
-							gint _tmp262_ = 0;
-							gint _tmp263_ = 0;
-							gint _tmp264_ = 0;
-							guint8* _tmp265_ = NULL;
-							gint offset = 0;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							mask = 0x80;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							depth = 1;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp261_ = g_strdup ("DeviceGray");
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_g_free0 (color_space);
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							color_space = _tmp261_;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp262_ = height;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp263_ = width;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length = _tmp262_ * ((_tmp263_ + 7) / 8);
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp264_ = data_length;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp265_ = g_new0 (guint8, _tmp264_);
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = (g_free (data), NULL);
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp265_;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp264_;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_data_size_ = data_length1;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							offset = 0;
-#line 3639 "book.c"
-							{
-								gint row = 0;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								row = 0;
-#line 3644 "book.c"
-								{
-									gboolean _tmp266_ = FALSE;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp266_ = TRUE;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									while (TRUE) {
-#line 3651 "book.c"
-										gint _tmp268_ = 0;
-										gint _tmp269_ = 0;
-										gint _tmp270_ = 0;
-										gint in_offset = 0;
-										gint _tmp272_ = 0;
-										GdkPixbuf* _tmp273_ = NULL;
-										gint _tmp274_ = 0;
-										gint _tmp275_ = 0;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!_tmp266_) {
-#line 3662 "book.c"
-											gint _tmp267_ = 0;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp267_ = row;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											row = _tmp267_ + 1;
-#line 3668 "book.c"
-										}
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp266_ = FALSE;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp268_ = row;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp269_ = height;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!(_tmp268_ < _tmp269_)) {
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											break;
-#line 3680 "book.c"
-										}
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp270_ = mask;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (_tmp270_ != 0x80) {
-#line 3686 "book.c"
-											gint _tmp271_ = 0;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp271_ = offset;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											offset = _tmp271_ + 1;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											mask = 0x80;
-#line 3694 "book.c"
-										}
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp272_ = row;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp273_ = image;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp274_ = gdk_pixbuf_get_rowstride (_tmp273_);
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp275_ = _tmp274_;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										in_offset = _tmp272_ * _tmp275_;
-#line 3706 "book.c"
-										{
-											gint x = 0;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											x = 0;
-#line 3711 "book.c"
-											{
-												gboolean _tmp276_ = FALSE;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp276_ = TRUE;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												while (TRUE) {
-#line 3718 "book.c"
-													gint _tmp278_ = 0;
-													gint _tmp279_ = 0;
-													gint _tmp280_ = 0;
-													guint8* _tmp284_ = NULL;
-													gint _tmp284__length1 = 0;
-													gint _tmp285_ = 0;
-													gint _tmp286_ = 0;
-													guint8 _tmp287_ = 0U;
-													gint _tmp292_ = 0;
-													gint _tmp293_ = 0;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!_tmp276_) {
-#line 3731 "book.c"
-														gint _tmp277_ = 0;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp277_ = x;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														x = _tmp277_ + 1;
-#line 3737 "book.c"
-													}
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp276_ = FALSE;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp278_ = x;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp279_ = width;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!(_tmp278_ < _tmp279_)) {
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														break;
-#line 3749 "book.c"
-													}
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp280_ = mask;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (_tmp280_ == 0x80) {
-#line 3755 "book.c"
-														guint8* _tmp281_ = NULL;
-														gint _tmp281__length1 = 0;
-														gint _tmp282_ = 0;
-														guint8 _tmp283_ = 0U;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp281_ = data;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp281__length1 = data_length1;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp282_ = offset;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp281_[_tmp282_] = (guint8) 0;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp283_ = _tmp281_[_tmp282_];
-#line 3770 "book.c"
-													}
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp284_ = pixels;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp284__length1 = pixels_length1;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp285_ = in_offset;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp286_ = x;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp287_ = _tmp284_[_tmp285_ + (_tmp286_ * 3)];
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (((gint) _tmp287_) != 0) {
-#line 3784 "book.c"
-														guint8* _tmp288_ = NULL;
-														gint _tmp288__length1 = 0;
-														gint _tmp289_ = 0;
-														gint _tmp290_ = 0;
-														guint8 _tmp291_ = 0U;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp288_ = data;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp288__length1 = data_length1;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp289_ = offset;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp290_ = mask;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp288_[_tmp289_] |= (guint8) _tmp290_;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp291_ = _tmp288_[_tmp289_];
-#line 3802 "book.c"
-													}
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp292_ = mask;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													mask = _tmp292_ >> 1;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp293_ = mask;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (_tmp293_ == 0) {
-#line 3812 "book.c"
-														gint _tmp294_ = 0;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp294_ = offset;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														offset = _tmp294_ + 1;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														mask = 0x80;
-#line 3820 "book.c"
-													}
-												}
-											}
-										}
-									}
-								}
-							}
-						} else {
-							gchar* _tmp295_ = NULL;
-							gint data_length = 0;
-							gint _tmp296_ = 0;
-							gint _tmp297_ = 0;
-							gint _tmp298_ = 0;
-							guint8* _tmp299_ = NULL;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							depth = 8;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp295_ = g_strdup ("DeviceGray");
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_g_free0 (color_space);
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							color_space = _tmp295_;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp296_ = height;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp297_ = width;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length = _tmp296_ * _tmp297_;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp298_ = data_length;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp299_ = g_new0 (guint8, _tmp298_);
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = (g_free (data), NULL);
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp299_;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp298_;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_data_size_ = data_length1;
-#line 3861 "book.c"
-							{
-								gint row = 0;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								row = 0;
-#line 3866 "book.c"
-								{
-									gboolean _tmp300_ = FALSE;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp300_ = TRUE;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									while (TRUE) {
-#line 3873 "book.c"
-										gint _tmp302_ = 0;
-										gint _tmp303_ = 0;
-										gint in_offset = 0;
-										gint _tmp304_ = 0;
-										GdkPixbuf* _tmp305_ = NULL;
-										gint _tmp306_ = 0;
-										gint _tmp307_ = 0;
-										gint out_offset = 0;
-										gint _tmp308_ = 0;
-										gint _tmp309_ = 0;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!_tmp300_) {
-#line 3886 "book.c"
-											gint _tmp301_ = 0;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp301_ = row;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											row = _tmp301_ + 1;
-#line 3892 "book.c"
-										}
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp300_ = FALSE;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp302_ = row;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp303_ = height;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!(_tmp302_ < _tmp303_)) {
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											break;
-#line 3904 "book.c"
-										}
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp304_ = row;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp305_ = image;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp306_ = gdk_pixbuf_get_rowstride (_tmp305_);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp307_ = _tmp306_;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										in_offset = _tmp304_ * _tmp307_;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp308_ = row;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp309_ = width;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										out_offset = _tmp308_ * _tmp309_;
-#line 3922 "book.c"
-										{
-											gint x = 0;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											x = 0;
-#line 3927 "book.c"
-											{
-												gboolean _tmp310_ = FALSE;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp310_ = TRUE;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												while (TRUE) {
-#line 3934 "book.c"
-													gint _tmp312_ = 0;
-													gint _tmp313_ = 0;
-													guint8* _tmp314_ = NULL;
-													gint _tmp314__length1 = 0;
-													gint _tmp315_ = 0;
-													gint _tmp316_ = 0;
-													guint8* _tmp317_ = NULL;
-													gint _tmp317__length1 = 0;
-													gint _tmp318_ = 0;
-													gint _tmp319_ = 0;
-													guint8 _tmp320_ = 0U;
-													guint8 _tmp321_ = 0U;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!_tmp310_) {
-#line 3949 "book.c"
-														gint _tmp311_ = 0;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp311_ = x;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														x = _tmp311_ + 1;
-#line 3955 "book.c"
-													}
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp310_ = FALSE;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp312_ = x;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp313_ = width;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!(_tmp312_ < _tmp313_)) {
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														break;
-#line 3967 "book.c"
-													}
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp314_ = data;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp314__length1 = data_length1;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp315_ = out_offset;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp316_ = x;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp317_ = pixels;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp317__length1 = pixels_length1;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp318_ = in_offset;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp319_ = x;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp320_ = _tmp317_[_tmp318_ + (_tmp319_ * 3)];
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp314_[_tmp315_ + _tmp316_] = _tmp320_;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp321_ = _tmp314_[_tmp315_ + _tmp316_];
-#line 3991 "book.c"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp322_ = data;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp322__length1 = data_length1;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp324_ = book_compress_zlib (self, _tmp322_, _tmp322__length1, &_tmp323_);
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data = _tmp324_;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data_length1 = _tmp323_;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_compressed_data_size_ = compressed_data_length1;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp325_ = compressed_data;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp325__length1 = compressed_data_length1;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp325_ != NULL) {
-#line 4019 "book.c"
-					gint _tmp326_ = 0;
-					const gchar* _tmp339_ = NULL;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp326_ = depth;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp326_ > 1) {
-#line 4026 "book.c"
-						guint8* jpeg_data = NULL;
-						GdkPixbuf* _tmp327_ = NULL;
-						gint _tmp328_ = 0;
-						Page* _tmp329_ = NULL;
-						gint _tmp330_ = 0;
-						gint _tmp331_ = 0;
-						gint _tmp332_ = 0;
-						guint8* _tmp333_ = NULL;
-						gint jpeg_data_length1 = 0;
-						gint _jpeg_data_size_ = 0;
-						guint8* _tmp334_ = NULL;
-						gint _tmp334__length1 = 0;
-						guint8* _tmp335_ = NULL;
-						gint _tmp335__length1 = 0;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp327_ = image;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp328_ = quality;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp329_ = page;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp330_ = page_get_dpi (_tmp329_);
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp331_ = _tmp330_;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp333_ = book_compress_jpeg (self, _tmp327_, _tmp328_, _tmp331_, &_tmp332_);
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data = _tmp333_;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data_length1 = _tmp332_;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_jpeg_data_size_ = jpeg_data_length1;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp334_ = jpeg_data;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp334__length1 = jpeg_data_length1;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp335_ = compressed_data;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp335__length1 = compressed_data_length1;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						if (_tmp334__length1 < _tmp335__length1) {
-#line 4069 "book.c"
-							gchar* _tmp336_ = NULL;
-							guint8* _tmp337_ = NULL;
-							gint _tmp337__length1 = 0;
-							guint8* _tmp338_ = NULL;
-							gint _tmp338__length1 = 0;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp336_ = g_strdup ("DCTDecode");
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_g_free0 (filter);
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							filter = _tmp336_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp337_ = jpeg_data;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp337__length1 = jpeg_data_length1;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp338_ = (_tmp337_ != NULL) ? _vala_array_dup1 (_tmp337_, _tmp337__length1) : ((gpointer) _tmp337_);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp338__length1 = _tmp337__length1;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = (g_free (data), NULL);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp338_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp338__length1;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_data_size_ = data_length1;
-#line 4097 "book.c"
-						}
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data = (g_free (jpeg_data), NULL);
-#line 4101 "book.c"
-					}
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp339_ = filter;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp339_ == NULL) {
-#line 4107 "book.c"
-						gchar* _tmp340_ = NULL;
-						guint8* _tmp341_ = NULL;
-						gint _tmp341__length1 = 0;
-						guint8* _tmp342_ = NULL;
-						gint _tmp342__length1 = 0;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp340_ = g_strdup ("FlateDecode");
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_g_free0 (filter);
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						filter = _tmp340_;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp341_ = compressed_data;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp341__length1 = compressed_data_length1;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp342_ = (_tmp341_ != NULL) ? _vala_array_dup2 (_tmp341_, _tmp341__length1) : ((gpointer) _tmp341_);
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp342__length1 = _tmp341__length1;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = (g_free (data), NULL);
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = _tmp342_;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length1 = _tmp342__length1;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_data_size_ = data_length1;
-#line 4135 "book.c"
-					}
-				}
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp343_ = writer;
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp343_, "\n");
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp344_ = writer;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp345_ = page_numbers;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp345__length1 = page_numbers_length1;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp346_ = i;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp347_ = _tmp345_[_tmp346_];
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_start_object (_tmp344_, _tmp347_);
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp348_ = writer;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp349_ = page_numbers;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp349__length1 = page_numbers_length1;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp350_ = i;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp351_ = _tmp349_[_tmp350_];
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp352_ = g_strdup_printf ("%u 0 obj\n", _tmp351_);
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp353_ = _tmp352_;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp348_, _tmp353_);
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp353_);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp354_ = writer;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp354_, "<<\n");
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp355_ = writer;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp355_, "/Type /Page\n");
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp356_ = writer;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp357_ = pages_number;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp358_ = g_strdup_printf ("/Parent %u 0 R\n", _tmp357_);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp359_ = _tmp358_;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp356_, _tmp359_);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp359_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp360_ = writer;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp361_ = i;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp362_ = page_image_numbers;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp362__length1 = page_image_numbers_length1;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp363_ = i;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp364_ = _tmp362_[_tmp363_];
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp365_ = g_strdup_printf ("/Resources << /XObject << /Im%d %u 0 R >> >>\n", _tmp361_, _tmp364_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp366_ = _tmp365_;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp360_, _tmp366_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp366_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp367_ = writer;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp368_ = page_width;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp369_ = width_buffer;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp369__length1 = width_buffer_length1;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp370_ = g_ascii_formatd (_tmp369_, _tmp369__length1, "%.2f", _tmp368_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp371_ = page_height;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp372_ = height_buffer;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp372__length1 = height_buffer_length1;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp373_ = g_ascii_formatd (_tmp372_, _tmp372__length1, "%.2f", _tmp371_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp374_ = g_strdup_printf ("/MediaBox [ 0 0 %s %s ]\n", _tmp370_, _tmp373_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp375_ = _tmp374_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp367_, _tmp375_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp375_);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp376_ = writer;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp377_ = page_content_numbers;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp377__length1 = page_content_numbers_length1;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp378_ = i;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp379_ = _tmp377_[_tmp378_];
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp380_ = g_strdup_printf ("/Contents %u 0 R\n", _tmp379_);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp381_ = _tmp380_;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp376_, _tmp381_);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp381_);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp382_ = writer;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp382_, ">>\n");
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp383_ = writer;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp383_, "endobj\n");
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp384_ = writer;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp384_, "\n");
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp385_ = writer;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp386_ = page_image_numbers;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp386__length1 = page_image_numbers_length1;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp387_ = i;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp388_ = _tmp386_[_tmp387_];
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_start_object (_tmp385_, _tmp388_);
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp389_ = writer;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp390_ = page_image_numbers;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp390__length1 = page_image_numbers_length1;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp391_ = i;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp392_ = _tmp390_[_tmp391_];
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp393_ = g_strdup_printf ("%u 0 obj\n", _tmp392_);
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp394_ = _tmp393_;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp389_, _tmp394_);
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp394_);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp395_ = writer;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp395_, "<<\n");
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp396_ = writer;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp396_, "/Type /XObject\n");
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp397_ = writer;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp397_, "/Subtype /Image\n");
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp398_ = writer;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp399_ = width;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp400_ = g_strdup_printf ("/Width %d\n", _tmp399_);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp401_ = _tmp400_;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp398_, _tmp401_);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp401_);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp402_ = writer;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp403_ = height;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp404_ = g_strdup_printf ("/Height %d\n", _tmp403_);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp405_ = _tmp404_;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp402_, _tmp405_);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp405_);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp406_ = writer;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp407_ = color_space;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp408_ = g_strdup_printf ("/ColorSpace /%s\n", _tmp407_);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp409_ = _tmp408_;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp406_, _tmp409_);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp409_);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp410_ = writer;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp411_ = depth;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp412_ = g_strdup_printf ("/BitsPerComponent %d\n", _tmp411_);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp413_ = _tmp412_;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp410_, _tmp413_);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp413_);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp414_ = writer;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp415_ = data;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp415__length1 = data_length1;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp416_ = g_strdup_printf ("/Length %d\n", _tmp415__length1);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp417_ = _tmp416_;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp414_, _tmp417_);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp417_);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp418_ = filter;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp418_ != NULL) {
-#line 4376 "book.c"
-					PDFWriter* _tmp419_ = NULL;
-					const gchar* _tmp420_ = NULL;
-					gchar* _tmp421_ = NULL;
-					gchar* _tmp422_ = NULL;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp419_ = writer;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp420_ = filter;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp421_ = g_strdup_printf ("/Filter /%s\n", _tmp420_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp422_ = _tmp421_;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					pdf_writer_write_string (_tmp419_, _tmp422_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_g_free0 (_tmp422_);
-#line 4393 "book.c"
-				}
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp423_ = writer;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp423_, ">>\n");
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp424_ = writer;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp424_, "stream\n");
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp425_ = writer;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp426_ = data;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp426__length1 = data_length1;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write (_tmp425_, _tmp426_, _tmp426__length1);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp427_ = writer;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp427_, "\n");
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp428_ = writer;
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp428_, "endstream\n");
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp429_ = writer;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp429_, "endobj\n");
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp430_ = writer;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp430_, "\n");
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp431_ = writer;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp432_ = struct_tree_root_number;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_start_object (_tmp431_, _tmp432_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp433_ = writer;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp434_ = struct_tree_root_number;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp435_ = g_strdup_printf ("%u 0 obj\n", _tmp434_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp436_ = _tmp435_;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp433_, _tmp436_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp436_);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp437_ = writer;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp437_, "<<\n");
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp438_ = writer;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp438_, "/Type /StructTreeRoot\n");
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp439_ = writer;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp439_, ">>\n");
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp440_ = writer;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp440_, "endobj\n");
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp441_ = page_width;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp442_ = width_buffer;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp442__length1 = width_buffer_length1;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp443_ = g_ascii_formatd (_tmp442_, _tmp442__length1, "%f", _tmp441_);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp444_ = page_height;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp445_ = height_buffer;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp445__length1 = height_buffer_length1;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp446_ = g_ascii_formatd (_tmp445_, _tmp445__length1, "%f", _tmp444_);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp447_ = i;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp448_ = g_strdup_printf ("q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ", _tmp443_, _tmp446_, _tmp447_);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				command = _tmp448_;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp449_ = writer;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp449_, "\n");
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp450_ = writer;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp451_ = page_content_numbers;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp451__length1 = page_content_numbers_length1;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp452_ = i;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp453_ = _tmp451_[_tmp452_];
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_start_object (_tmp450_, _tmp453_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp454_ = writer;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp455_ = page_content_numbers;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp455__length1 = page_content_numbers_length1;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp456_ = i;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp457_ = _tmp455_[_tmp456_];
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp458_ = g_strdup_printf ("%u 0 obj\n", _tmp457_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp459_ = _tmp458_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp454_, _tmp459_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp459_);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp460_ = writer;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp460_, "<<\n");
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp461_ = writer;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp462_ = command;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp463_ = strlen (_tmp462_);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp464_ = _tmp463_;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp465_ = g_strdup_printf ("/Length %d\n", _tmp464_);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp466_ = _tmp465_;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp461_, _tmp466_);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp466_);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp467_ = writer;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp467_, ">>\n");
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp468_ = writer;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp468_, "stream\n");
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp469_ = writer;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp470_ = command;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp469_, _tmp470_);
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp471_ = writer;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp471_, "\n");
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp472_ = writer;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp472_, "endstream\n");
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp473_ = writer;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp473_, "endobj\n");
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp474_ = i;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp474_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (command);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data = (g_free (compressed_data), NULL);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				data = (g_free (data), NULL);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height_buffer = (g_free (height_buffer), NULL);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer = (g_free (width_buffer), NULL);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (filter);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (color_space);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_object_unref0 (image);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_page_unref0 (page);
-#line 4585 "book.c"
-			}
-		}
-	}
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp475_ = writer;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp475_, "\n");
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp476_ = writer;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp477_ = info_number;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_start_object (_tmp476_, _tmp477_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp478_ = writer;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp479_ = info_number;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp480_ = g_strdup_printf ("%u 0 obj\n", _tmp479_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp481_ = _tmp480_;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp478_, _tmp481_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp481_);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp482_ = writer;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp482_, "<<\n");
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp483_ = writer;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp484_ = g_strdup_printf ("/Creator (Simple Scan %s)\n", VERSION);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp485_ = _tmp484_;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp483_, _tmp485_);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp485_);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp486_ = writer;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp486_, ">>\n");
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp487_ = writer;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp487_, "endobj\n");
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp488_ = writer;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp488_, "\n");
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp489_ = writer;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp490_ = _tmp489_->offset;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	xref_offset = _tmp490_;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp491_ = writer;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp491_, "xref\n");
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp492_ = writer;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp493_ = writer;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp494_ = _tmp493_->object_offsets;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp494__length1 = _tmp493_->object_offsets_length1;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp495_ = g_strdup_printf ("0 %zu\n", (gsize) (_tmp494__length1 + 1));
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp496_ = _tmp495_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp492_, _tmp496_);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp496_);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp497_ = writer;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp498_ = writer;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp499_ = book_next_empty_object (_tmp498_, 0);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp500_ = g_strdup_printf ("%010zu 65535 f \n", (gsize) _tmp499_);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp501_ = _tmp500_;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp497_, _tmp501_);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp501_);
-#line 4677 "book.c"
-	{
-		gint i = 0;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = 0;
-#line 4682 "book.c"
-		{
-			gboolean _tmp502_ = FALSE;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp502_ = TRUE;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 4689 "book.c"
-				gint _tmp504_ = 0;
-				PDFWriter* _tmp505_ = NULL;
-				guint* _tmp506_ = NULL;
-				gint _tmp506__length1 = 0;
-				PDFWriter* _tmp507_ = NULL;
-				guint* _tmp508_ = NULL;
-				gint _tmp508__length1 = 0;
-				gint _tmp509_ = 0;
-				guint _tmp510_ = 0U;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp502_) {
-#line 4701 "book.c"
-					gint _tmp503_ = 0;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp503_ = i;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp503_ + 1;
-#line 4707 "book.c"
-				}
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp502_ = FALSE;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp504_ = i;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp505_ = writer;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp506_ = _tmp505_->object_offsets;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp506__length1 = _tmp505_->object_offsets_length1;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(_tmp504_ < _tmp506__length1)) {
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 4723 "book.c"
-				}
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp507_ = writer;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp508_ = _tmp507_->object_offsets;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp508__length1 = _tmp507_->object_offsets_length1;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp509_ = i;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp510_ = _tmp508_[_tmp509_];
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp510_ == ((guint) 0)) {
-#line 4737 "book.c"
-					PDFWriter* _tmp511_ = NULL;
-					PDFWriter* _tmp512_ = NULL;
-					gint _tmp513_ = 0;
-					gint _tmp514_ = 0;
-					gchar* _tmp515_ = NULL;
-					gchar* _tmp516_ = NULL;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp511_ = writer;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp512_ = writer;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp513_ = i;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp514_ = book_next_empty_object (_tmp512_, _tmp513_ + 1);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp515_ = g_strdup_printf ("%010zu 65535 f \n", (gsize) _tmp514_);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp516_ = _tmp515_;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					pdf_writer_write_string (_tmp511_, _tmp516_);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_g_free0 (_tmp516_);
-#line 4760 "book.c"
-				} else {
-					PDFWriter* _tmp517_ = NULL;
-					PDFWriter* _tmp518_ = NULL;
-					guint* _tmp519_ = NULL;
-					gint _tmp519__length1 = 0;
-					gint _tmp520_ = 0;
-					guint _tmp521_ = 0U;
-					gchar* _tmp522_ = NULL;
-					gchar* _tmp523_ = NULL;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp517_ = writer;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp518_ = writer;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp519_ = _tmp518_->object_offsets;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp519__length1 = _tmp518_->object_offsets_length1;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp520_ = i;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp521_ = _tmp519_[_tmp520_];
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp522_ = g_strdup_printf ("%010zu 00000 n \n", (gsize) _tmp521_);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp523_ = _tmp522_;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					pdf_writer_write_string (_tmp517_, _tmp523_);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_g_free0 (_tmp523_);
-#line 4790 "book.c"
-				}
-			}
-		}
-	}
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp524_ = writer;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp524_, "\n");
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp525_ = writer;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp525_, "trailer\n");
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp526_ = writer;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp526_, "<<\n");
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp527_ = writer;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp528_ = writer;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp529_ = _tmp528_->object_offsets;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp529__length1 = _tmp528_->object_offsets_length1;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp530_ = g_strdup_printf ("/Size %zu\n", (gsize) (_tmp529__length1 + 1));
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp531_ = _tmp530_;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp527_, _tmp531_);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp531_);
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp532_ = writer;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp533_ = info_number;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp534_ = g_strdup_printf ("/Info %u 0 R\n", _tmp533_);
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp535_ = _tmp534_;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp532_, _tmp535_);
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp535_);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp536_ = writer;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp537_ = catalog_number;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp538_ = g_strdup_printf ("/Root %u 0 R\n", _tmp537_);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp539_ = _tmp538_;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp536_, _tmp539_);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp539_);
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp540_ = writer;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp541_ = id;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp542_ = id;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp543_ = g_strdup_printf ("/ID [<%s> <%s>]\n", _tmp541_, _tmp542_);
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp544_ = _tmp543_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp540_, _tmp544_);
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp544_);
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp545_ = writer;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp545_, ">>\n");
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp546_ = writer;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp546_, "startxref\n");
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp547_ = writer;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp548_ = xref_offset;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp549_ = g_strdup_printf ("%zu\n", _tmp548_);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp550_ = _tmp549_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp547_, _tmp550_);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp550_);
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp551_ = writer;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp551_, "%%EOF\n");
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (metadata);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (date_string);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_date_time_unref0 (now);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page_content_numbers = (g_free (page_content_numbers), NULL);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page_image_numbers = (g_free (page_image_numbers), NULL);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page_numbers = (g_free (page_numbers), NULL);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_pdf_writer_unref0 (writer);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_object_unref0 (stream);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (id);
-#line 4903 "book.c"
-}
-
-
-static gint book_next_empty_object (PDFWriter* writer, gint start) {
-	gint result = 0;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (writer != NULL, 0);
-#line 4911 "book.c"
-	{
-		gint i = 0;
-		gint _tmp0_ = 0;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp0_ = start;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		i = _tmp0_;
-#line 4919 "book.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp1_ = TRUE;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			while (TRUE) {
-#line 4926 "book.c"
-				gint _tmp3_ = 0;
-				PDFWriter* _tmp4_ = NULL;
-				guint* _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				PDFWriter* _tmp6_ = NULL;
-				guint* _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				gint _tmp8_ = 0;
-				guint _tmp9_ = 0U;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp1_) {
-#line 4938 "book.c"
-					gint _tmp2_ = 0;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp2_ = i;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp2_ + 1;
-#line 4944 "book.c"
-				}
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp1_ = FALSE;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp3_ = i;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp4_ = writer;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp5_ = _tmp4_->object_offsets;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp5__length1 = _tmp4_->object_offsets_length1;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(_tmp3_ < _tmp5__length1)) {
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 4960 "book.c"
-				}
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp6_ = writer;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp7_ = _tmp6_->object_offsets;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp7__length1 = _tmp6_->object_offsets_length1;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp8_ = i;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp9_ = _tmp7_[_tmp8_];
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp9_ == ((guint) 0)) {
-#line 4974 "book.c"
-					gint _tmp10_ = 0;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp10_ = i;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					result = _tmp10_ + 1;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					return result;
-#line 4982 "book.c"
-				}
-			}
-		}
-	}
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = 0;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 4991 "book.c"
-}
-
-
-void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError** error) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GQuark _tmp3_ = 0U;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	static GQuark _tmp2_label0 = 0;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	static GQuark _tmp2_label1 = 0;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	static GQuark _tmp2_label2 = 0;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	static GQuark _tmp2_label3 = 0;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	static GQuark _tmp2_label4 = 0;
-#line 5009 "book.c"
-	GError * _inner_error_ = NULL;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (type != NULL);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (file != NULL);
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = type;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = _tmp0_;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 610 "/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 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		switch (0) {
-#line 5027 "book.c"
-			default:
-			{
-				const gchar* _tmp4_ = NULL;
-				gint _tmp5_ = 0;
-				GFile* _tmp6_ = NULL;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp4_ = type;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp5_ = quality;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp6_ = file;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				book_save_multi_file (self, _tmp4_, _tmp5_, _tmp6_, &_inner_error_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					g_propagate_error (error, _inner_error_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					return;
-#line 5047 "book.c"
-				}
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				break;
-#line 5051 "book.c"
-			}
-		}
-	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("ps")))) {
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		switch (0) {
-#line 5057 "book.c"
-			default:
-			{
-				GFile* _tmp7_ = NULL;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp7_ = file;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				book_save_ps (self, _tmp7_, &_inner_error_);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					g_propagate_error (error, _inner_error_);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					return;
-#line 5071 "book.c"
-				}
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				break;
-#line 5075 "book.c"
-			}
-		}
-	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("pdf")))) {
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		switch (0) {
-#line 5081 "book.c"
-			default:
-			{
-				GFile* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp8_ = file;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp9_ = quality;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				book_save_pdf (self, _tmp8_, _tmp9_, &_inner_error_);
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					g_propagate_error (error, _inner_error_);
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					return;
-#line 5098 "book.c"
-				}
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				break;
-#line 5102 "book.c"
-			}
-		}
-	}
-}
-
-
-guint book_get_n_pages (Book* self) {
-	guint result;
-	GList* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, 0U);
-#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->pages;
-#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = g_list_length (_tmp0_);
-#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = _tmp1_;
-#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 5123 "book.c"
-}
-
-
-gboolean book_get_needs_saving (Book* self) {
-	gboolean result;
-	gboolean _tmp0_ = FALSE;
-#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->needs_saving_;
-#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = _tmp0_;
-#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 5138 "book.c"
-}
-
-
-void book_set_needs_saving (Book* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 22 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 24 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->needs_saving_;
-#line 24 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = value;
-#line 24 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_tmp0_ == _tmp1_) {
-#line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return;
-#line 5156 "book.c"
-	}
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = value;
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->needs_saving_ = _tmp2_;
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "needs-saving-changed");
-#line 5164 "book.c"
-}
-
-
-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) {
-	typedef void (*GMarshalFunc_VOID__PAGE) (gpointer data1, gpointer arg_1, gpointer data2);
-	register GMarshalFunc_VOID__PAGE callback;
-	register GCClosure * cc;
-	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 5183 "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 5189 "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 5195 "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 5202 "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 5211 "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 5221 "book.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 5225 "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 5233 "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 5240 "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 5247 "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 5251 "book.c"
-		}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = book_ref (object);
-#line 5255 "book.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = NULL;
-#line 5259 "book.c"
-	}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return NULL;
-#line 5263 "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 5274 "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 5280 "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 5284 "book.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		*object_p = book_ref (value->data[0].v_pointer);
-#line 5288 "book.c"
-	}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return NULL;
-#line 5292 "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 5306 "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 5315 "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 5335 "book.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = NULL;
-#line 5339 "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 5345 "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 5364 "book.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = NULL;
-#line 5368 "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 5374 "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"
-	((BookClass *) 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 5398 "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 5407 "book.c"
-}
-
-
-static void book_finalize (Book* obj) {
-	Book * self;
-	GList* _tmp0_ = NULL;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BOOK, Book);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_handlers_destroy (self);
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->pages;
-#line 5420 "book.c"
-	{
-		GList* page_collection = NULL;
-		GList* page_it = NULL;
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		page_collection = _tmp0_;
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
-#line 5428 "book.c"
-			Page* _tmp1_ = NULL;
-			Page* page = NULL;
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp1_ = _page_ref0 ((Page*) page_it->data);
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			page = _tmp1_;
-#line 5435 "book.c"
-			{
-				Page* _tmp2_ = NULL;
-				guint _tmp3_ = 0U;
-				Page* _tmp4_ = NULL;
-				guint _tmp5_ = 0U;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp2_ = page;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 47 "/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 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp4_ = page;
-#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
-#line 48 "/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 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_page_unref0 (page);
-#line 5455 "book.c"
-			}
-		}
-	}
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 5463 "book.c"
-}
-
-
-GType book_get_type (void) {
-	static volatile gsize book_type_id__volatile = 0;
-	if (g_once_init_enter (&book_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_book_init, value_book_free_value, value_book_copy_value, value_book_peek_pointer, "p", value_book_collect_value, "p", value_book_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (BookClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) book_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Book), 0, (GInstanceInitFunc) book_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 book_type_id;
-		book_type_id = g_type_register_fundamental (g_type_fundamental_next (), "Book", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&book_type_id__volatile, book_type_id);
-	}
-	return book_type_id__volatile;
-}
-
-
-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 5488 "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 5501 "book.c"
-	}
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 5509 "book.c"
-}
-
-
-PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream) {
-	PDFWriter* self = NULL;
-	GFileOutputStream* _tmp0_ = NULL;
-	GFileOutputStream* _tmp1_ = NULL;
-	guint* _tmp2_ = NULL;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (stream != NULL, NULL);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self = (PDFWriter*) g_type_create_instance (object_type);
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = stream;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_object_unref0 (self->priv->stream);
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->stream = _tmp1_;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = g_new0 (guint, 0);
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->object_offsets = (g_free (self->object_offsets), NULL);
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->object_offsets = _tmp2_;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->object_offsets_length1 = 0;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->_object_offsets_size_ = self->object_offsets_length1;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return self;
-#line 5542 "book.c"
-}
-
-
-PDFWriter* pdf_writer_new (GFileOutputStream* stream) {
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return pdf_writer_construct (TYPE_PDF_WRITER, stream);
-#line 5549 "book.c"
-}
-
-
-void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
-	gsize _tmp4_ = 0UL;
-	guint8* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	GError * _inner_error_ = NULL;
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 5560 "book.c"
-	{
-		GFileOutputStream* _tmp0_ = NULL;
-		guint8* _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp0_ = self->priv->stream;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp1_ = data;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp1__length1 = data_length1;
-#line 643 "/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 643 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5575 "book.c"
-			goto __catch1_g_error;
-		}
-	}
-	goto __finally1;
-	__catch1_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		e = _inner_error_;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_inner_error_ = NULL;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp2_ = e;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp3_ = _tmp2_->message;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_warning ("book.vala:647: Error writing PDF: %s", _tmp3_);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_g_error_free0 (e);
-#line 5597 "book.c"
-	}
-	__finally1:
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 641 "/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 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_clear_error (&_inner_error_);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return;
-#line 5608 "book.c"
-	}
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = self->offset;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = data;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5__length1 = data_length1;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->offset = _tmp4_ + _tmp5__length1;
-#line 5618 "book.c"
-}
-
-
-static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	gint _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gchar* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-#line 1405 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result__length1 = _tmp1_ + 1;
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	__result__size_ = _result__length1;
-#line 1407 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = _result__length1;
-#line 1407 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result__length1 = _tmp3_ - 1;
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp4_ = _result_;
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp4__length1 = _result__length1;
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp5_ = strlen (self);
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp6_ = _tmp5_;
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp7_ = _result_;
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp7__length1 = _result__length1;
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (result_length1) {
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		*result_length1 = _tmp7__length1;
-#line 5673 "book.c"
-	}
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp7_;
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 5679 "book.c"
-}
-
-
-void pdf_writer_write_string (PDFWriter* self, const gchar* text) {
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (text != NULL);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = text;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = string_to_utf8 (_tmp0_, &_tmp1_);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = (guint8*) _tmp2_;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3__length1 = (_tmp1_ * sizeof (gchar)) / sizeof (guint8);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write (self, _tmp3_, (_tmp1_ * sizeof (gchar)) / sizeof (guint8));
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = (g_free (_tmp3_), NULL);
-#line 5705 "book.c"
-}
-
-
-guint pdf_writer_add_object (PDFWriter* self) {
-	guint result = 0U;
-	guint* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gint _tmp1_ = 0;
-	gint index = 0;
-	guint* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	guint* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint _tmp4_ = 0U;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, 0U);
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->object_offsets;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0__length1 = self->object_offsets_length1;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = _tmp0__length1 + 1;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->object_offsets = g_renew (guint, self->object_offsets, _tmp0__length1 + 1);
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	(_tmp1_ > self->object_offsets_length1) ? memset (self->object_offsets + self->object_offsets_length1, 0, sizeof (guint) * (_tmp1_ - self->object_offsets_length1)) : NULL;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->object_offsets_length1 = _tmp1_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->_object_offsets_size_ = _tmp1_;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = self->object_offsets;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2__length1 = self->object_offsets_length1;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	index = _tmp2__length1 - 1;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = self->object_offsets;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3__length1 = self->object_offsets_length1;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_[index] = (guint) 0;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = _tmp3_[index];
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = (guint) (index + 1);
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 5754 "book.c"
-}
-
-
-void pdf_writer_start_object (PDFWriter* self, guint index) {
-	guint* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	guint _tmp1_ = 0U;
-	gsize _tmp2_ = 0UL;
-	guint _tmp3_ = 0U;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->object_offsets;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0__length1 = self->object_offsets_length1;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = index;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = self->offset;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_[_tmp1_ - 1] = (guint) _tmp2_;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = _tmp0_[_tmp1_ - 1];
-#line 5778 "book.c"
-}
-
-
-static void value_pdf_writer_init (GValue* value) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	value->data[0].v_pointer = NULL;
-#line 5785 "book.c"
-}
-
-
-static void value_pdf_writer_free_value (GValue* value) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (value->data[0].v_pointer) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		pdf_writer_unref (value->data[0].v_pointer);
-#line 5794 "book.c"
-	}
-}
-
-
-static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (src_value->data[0].v_pointer) {
-#line 627 "/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 5804 "book.c"
-	} else {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 5808 "book.c"
-	}
-}
-
-
-static gpointer value_pdf_writer_peek_pointer (const GValue* value) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return value->data[0].v_pointer;
-#line 5816 "book.c"
-}
-
-
-static gchar* value_pdf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (collect_values[0].v_pointer) {
-#line 5823 "book.c"
-		PDFWriter* object;
-		object = collect_values[0].v_pointer;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 627 "/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 5830 "book.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 627 "/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 5834 "book.c"
-		}
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = pdf_writer_ref (object);
-#line 5838 "book.c"
-	} else {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = NULL;
-#line 5842 "book.c"
-	}
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return NULL;
-#line 5846 "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 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (!object_p) {
-#line 627 "/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 5857 "book.c"
-	}
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (!value->data[0].v_pointer) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		*object_p = NULL;
-#line 5863 "book.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		*object_p = value->data[0].v_pointer;
-#line 5867 "book.c"
-	} else {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		*object_p = pdf_writer_ref (value->data[0].v_pointer);
-#line 5871 "book.c"
-	}
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return NULL;
-#line 5875 "book.c"
-}
-
-
-GParamSpec* param_spec_pdf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecPDFWriter* spec;
-#line 627 "/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 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return G_PARAM_SPEC (spec);
-#line 5889 "book.c"
-}
-
-
-gpointer value_get_pdf_writer (const GValue* value) {
-#line 627 "/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 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return value->data[0].v_pointer;
-#line 5898 "book.c"
-}
-
-
-void value_set_pdf_writer (GValue* value, gpointer v_object) {
-	PDFWriter* old;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	old = value->data[0].v_pointer;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (v_object) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
-#line 627 "/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 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = v_object;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		pdf_writer_ref (value->data[0].v_pointer);
-#line 5918 "book.c"
-	} else {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = NULL;
-#line 5922 "book.c"
-	}
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (old) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		pdf_writer_unref (old);
-#line 5928 "book.c"
-	}
-}
-
-
-void value_take_pdf_writer (GValue* value, gpointer v_object) {
-	PDFWriter* old;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	old = value->data[0].v_pointer;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (v_object) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
-#line 627 "/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 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = v_object;
-#line 5947 "book.c"
-	} else {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = NULL;
-#line 5951 "book.c"
-	}
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (old) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		pdf_writer_unref (old);
-#line 5957 "book.c"
-	}
-}
-
-
-static void pdf_writer_class_init (PDFWriterClass * klass) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_parent_class = g_type_class_peek_parent (klass);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	((PDFWriterClass *) klass)->finalize = pdf_writer_finalize;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_type_class_add_private (klass, sizeof (PDFWriterPrivate));
-#line 5969 "book.c"
-}
-
-
-static void pdf_writer_instance_init (PDFWriter * self) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv = PDF_WRITER_GET_PRIVATE (self);
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->offset = (gsize) 0;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->ref_count = 1;
-#line 5980 "book.c"
-}
-
-
-static void pdf_writer_finalize (PDFWriter* obj) {
-	PDFWriter * self;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PDF_WRITER, PDFWriter);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_handlers_destroy (self);
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->object_offsets = (g_free (self->object_offsets), NULL);
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_object_unref0 (self->priv->stream);
-#line 5994 "book.c"
-}
-
-
-GType pdf_writer_get_type (void) {
-	static volatile gsize pdf_writer_type_id__volatile = 0;
-	if (g_once_init_enter (&pdf_writer_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_pdf_writer_init, value_pdf_writer_free_value, value_pdf_writer_copy_value, value_pdf_writer_peek_pointer, "p", value_pdf_writer_collect_value, "p", value_pdf_writer_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PDFWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pdf_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PDFWriter), 0, (GInstanceInitFunc) pdf_writer_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 pdf_writer_type_id;
-		pdf_writer_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PDFWriter", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&pdf_writer_type_id__volatile, pdf_writer_type_id);
-	}
-	return pdf_writer_type_id__volatile;
-}
-
-
-gpointer pdf_writer_ref (gpointer instance) {
-	PDFWriter* self;
-	self = instance;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return instance;
-#line 6019 "book.c"
-}
-
-
-void pdf_writer_unref (gpointer instance) {
-	PDFWriter* self;
-	self = instance;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		PDF_WRITER_GET_CLASS (self)->finalize (self);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 6032 "book.c"
-	}
-}
-
-
-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 ((PsWriter*) self, data, data_length1);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 6042 "book.c"
-}
-
-
-PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream) {
-	PsWriter* self = NULL;
-	GFileOutputStream* _tmp0_ = NULL;
-	GFileOutputStream* _tmp1_ = NULL;
-	cairo_surface_t* _tmp2_ = NULL;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (stream != NULL, NULL);
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self = (PsWriter*) g_type_create_instance (object_type);
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = stream;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_object_unref0 (self->stream);
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->stream = _tmp1_;
-#line 679 "/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 679 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_cairo_surface_destroy0 (self->surface);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->surface = _tmp2_;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return self;
-#line 6071 "book.c"
-}
-
-
-PsWriter* ps_writer_new (GFileOutputStream* stream) {
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return ps_writer_construct (TYPE_PS_WRITER, stream);
-#line 6078 "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 682 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 6087 "book.c"
-	{
-		GFileOutputStream* _tmp0_ = NULL;
-		guint8* _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp0_ = self->stream;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp1_ = data;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp1__length1 = data_length1;
-#line 686 "/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 686 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6102 "book.c"
-			goto __catch2_g_error;
-		}
-	}
-	goto __finally2;
-	__catch2_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		e = _inner_error_;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_inner_error_ = NULL;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp2_ = e;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp3_ = _tmp2_->message;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_warning ("book.vala:690: Error writing data: %s", _tmp3_);
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		result = CAIRO_STATUS_WRITE_ERROR;
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_g_error_free0 (e);
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return result;
-#line 6128 "book.c"
-	}
-	__finally2:
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 684 "/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 684 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_clear_error (&_inner_error_);
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return 0;
-#line 6139 "book.c"
-	}
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = CAIRO_STATUS_SUCCESS;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 6145 "book.c"
-}
-
-
-static void value_ps_writer_init (GValue* value) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	value->data[0].v_pointer = NULL;
-#line 6152 "book.c"
-}
-
-
-static void value_ps_writer_free_value (GValue* value) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (value->data[0].v_pointer) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		ps_writer_unref (value->data[0].v_pointer);
-#line 6161 "book.c"
-	}
-}
-
-
-static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (src_value->data[0].v_pointer) {
-#line 671 "/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 6171 "book.c"
-	} else {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 6175 "book.c"
-	}
-}
-
-
-static gpointer value_ps_writer_peek_pointer (const GValue* value) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return value->data[0].v_pointer;
-#line 6183 "book.c"
-}
-
-
-static gchar* value_ps_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (collect_values[0].v_pointer) {
-#line 6190 "book.c"
-		PsWriter* object;
-		object = collect_values[0].v_pointer;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 671 "/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 6197 "book.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 671 "/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 6201 "book.c"
-		}
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = ps_writer_ref (object);
-#line 6205 "book.c"
-	} else {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = NULL;
-#line 6209 "book.c"
-	}
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return NULL;
-#line 6213 "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 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (!object_p) {
-#line 671 "/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 6224 "book.c"
-	}
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (!value->data[0].v_pointer) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		*object_p = NULL;
-#line 6230 "book.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		*object_p = value->data[0].v_pointer;
-#line 6234 "book.c"
-	} else {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		*object_p = ps_writer_ref (value->data[0].v_pointer);
-#line 6238 "book.c"
-	}
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return NULL;
-#line 6242 "book.c"
-}
-
-
-GParamSpec* param_spec_ps_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecPsWriter* spec;
-#line 671 "/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 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return G_PARAM_SPEC (spec);
-#line 6256 "book.c"
-}
-
-
-gpointer value_get_ps_writer (const GValue* value) {
-#line 671 "/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 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return value->data[0].v_pointer;
-#line 6265 "book.c"
-}
-
-
-void value_set_ps_writer (GValue* value, gpointer v_object) {
-	PsWriter* old;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	old = value->data[0].v_pointer;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (v_object) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
-#line 671 "/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 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = v_object;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		ps_writer_ref (value->data[0].v_pointer);
-#line 6285 "book.c"
-	} else {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = NULL;
-#line 6289 "book.c"
-	}
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (old) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		ps_writer_unref (old);
-#line 6295 "book.c"
-	}
-}
-
-
-void value_take_ps_writer (GValue* value, gpointer v_object) {
-	PsWriter* old;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	old = value->data[0].v_pointer;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (v_object) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
-#line 671 "/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 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = v_object;
-#line 6314 "book.c"
-	} else {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		value->data[0].v_pointer = NULL;
-#line 6318 "book.c"
-	}
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (old) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		ps_writer_unref (old);
-#line 6324 "book.c"
-	}
-}
-
-
-static void ps_writer_class_init (PsWriterClass * klass) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	ps_writer_parent_class = g_type_class_peek_parent (klass);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	((PsWriterClass *) klass)->finalize = ps_writer_finalize;
-#line 6334 "book.c"
-}
-
-
-static void ps_writer_instance_init (PsWriter * self) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->ref_count = 1;
-#line 6341 "book.c"
-}
-
-
-static void ps_writer_finalize (PsWriter* obj) {
-	PsWriter * self;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PS_WRITER, PsWriter);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_handlers_destroy (self);
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_cairo_surface_destroy0 (self->surface);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_object_unref0 (self->stream);
-#line 6355 "book.c"
-}
-
-
-GType ps_writer_get_type (void) {
-	static volatile gsize ps_writer_type_id__volatile = 0;
-	if (g_once_init_enter (&ps_writer_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_ps_writer_init, value_ps_writer_free_value, value_ps_writer_copy_value, value_ps_writer_peek_pointer, "p", value_ps_writer_collect_value, "p", value_ps_writer_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PsWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) ps_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PsWriter), 0, (GInstanceInitFunc) ps_writer_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 ps_writer_type_id;
-		ps_writer_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PsWriter", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&ps_writer_type_id__volatile, ps_writer_type_id);
-	}
-	return ps_writer_type_id__volatile;
-}
-
-
-gpointer ps_writer_ref (gpointer instance) {
-	PsWriter* self;
-	self = instance;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return instance;
-#line 6380 "book.c"
-}
-
-
-void ps_writer_unref (gpointer instance) {
-	PsWriter* self;
-	self = instance;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		PS_WRITER_GET_CLASS (self)->finalize (self);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 6393 "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 4119cfc..d53b31a 100644
--- a/src/book.vala
+++ b/src/book.vala
@@ -9,31 +9,19 @@
  * license.
  */
 
+public delegate void ProgressionCallback (double fraction);
+
 public class Book
 {
     private List<Page> pages;
 
     public uint n_pages { get { return pages.length (); } }
 
-    private bool needs_saving_;
-    public bool needs_saving
-    {
-        get { return needs_saving_; }
-        set
-        {
-            if (needs_saving_ == value)
-                return;
-            needs_saving_ = value;
-            needs_saving_changed ();
-        }
-    }
-
     public signal void page_added (Page page);
     public signal void page_removed (Page page);
     public signal void reordered ();
     public signal void cleared ();
-    public signal void needs_saving_changed ();
-    public signal void saving (int i);
+    public signal void changed ();
 
     public Book ()
     {
@@ -62,7 +50,7 @@ public class Book
 
     private void page_changed_cb (Page page)
     {
-        needs_saving = true;
+        changed ();
     }
 
     public void append_page (Page page)
@@ -72,7 +60,7 @@ public class Book
 
         pages.append (page);
         page_added (page);
-        needs_saving = true;
+        changed ();
     }
 
     public void move_page (Page page, uint location)
@@ -80,7 +68,7 @@ public class Book
         pages.remove (page);
         pages.insert (page, (int) location);
         reordered ();
-        needs_saving = true;
+        changed ();
     }
 
     public void reverse ()
@@ -91,7 +79,7 @@ public class Book
         pages = (owned) new_pages;
 
         reordered ();
-        needs_saving = true;
+        changed ();
     }
 
     public void combine_sides ()
@@ -108,7 +96,7 @@ public class Book
         pages = (owned) new_pages;
 
         reordered ();
-        needs_saving = true;
+        changed ();
     }
 
     public void combine_sides_reverse ()
@@ -124,7 +112,7 @@ public class Book
         pages = (owned) new_pages;
 
         reordered ();
-        needs_saving = true;
+        changed ();
     }
 
     public void delete_page (Page page)
@@ -133,7 +121,7 @@ public class Book
         page.crop_changed.disconnect (page_changed_cb);
         pages.remove (page);
         page_removed (page);
-        needs_saving = true;
+        changed ();
     }
 
     public Page get_page (int page_number)
@@ -148,120 +136,440 @@ public class Book
         return pages.index (page);
     }
 
-    private File make_indexed_file (string uri, int i)
+    public async void save_async (string t, int q, File f, ProgressionCallback? p, Cancellable? c) throws Error
     {
-        if (n_pages == 1)
-            return File.new_for_uri (uri);
-
-        /* Insert index before extension */
-        var basename = Path.get_basename (uri);
-        string prefix = uri, suffix = "";
-        var extension_index = basename.last_index_of_char ('.');
-        if (extension_index >= 0)
-        {
-            suffix = basename.slice (extension_index, basename.length);
-            prefix = uri.slice (0, uri.length - suffix.length);
-        }
-        var width = 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);
+        var book_saver = new BookSaver ();
+        yield book_saver.save_async (this, t, q, f, p, c);
     }
+}
 
-    private void save_multi_file (string type, int quality, File file) throws Error
+private class BookSaver
+{
+    private uint n_pages;
+    private int quality;
+    private File file;
+    private unowned ProgressionCallback progression_callback;
+    private double progression;
+    private Mutex progression_mutex;
+    private Cancellable? cancellable;
+    private AsyncQueue<WriteTask> write_queue;
+    private ThreadPool<EncodeTask> encoder;
+    private SourceFunc save_async_callback;
+
+    /* save_async get called in the main thread to start saving. It
+     * distributes all encode tasks to other threads then yield so
+     * the ui can continue operating. The method then return once saving
+     * is completed, cancelled, or failed */
+    public async void save_async (Book book, string type, int quality, File file, ProgressionCallback? progression_callback, Cancellable? cancellable) throws Error
     {
+        var timer = new Timer ();
+
+        this.n_pages = book.n_pages;
+        this.quality = quality;
+        this.file = file;
+        this.cancellable = cancellable;
+        this.save_async_callback = save_async.callback;
+        this.write_queue = new AsyncQueue<WriteTask> ();
+        this.progression = 0;
+        this.progression_mutex = Mutex ();
+
+        /* Configure a callback that monitor saving progression */
+        if (progression_callback == null)
+            this.progression_callback = (fraction) =>
+            {
+                debug ("Save progression: %f%%", fraction*100.0);
+            };
+        else
+            this.progression_callback = progression_callback;
+
+        /* Configure an encoder */
+        ThreadPoolFunc<EncodeTask>? encode_delegate = null;
+        switch (type)
+        {
+        case "jpeg":
+            encode_delegate = encode_jpeg;
+            break;
+        case "png":
+            encode_delegate = encode_png;
+            break;
+#if HAVE_WEBP
+        case "webp":
+            encode_delegate = encode_webp;
+            break;
+#endif
+        case "pdf":
+            encode_delegate = encode_pdf;
+            break;
+        }
+        encoder = new ThreadPool<EncodeTask>.with_owned_data (encode_delegate, (int) get_num_processors (), false);
+
+        /* Configure a writer */
+        ThreadFunc<Error?>? write_delegate = null;
+        switch (type)
+        {
+        case "jpeg":
+        case "png":
+#if HAVE_WEBP
+        case "webp":
+#endif
+            write_delegate = write_multifile;
+            break;
+        case "pdf":
+            write_delegate = write_pdf;
+            break;
+        }
+        var writer = new Thread<Error?> (null, write_delegate);
+
+        /* Issue encode tasks */
         for (var i = 0; i < n_pages; i++)
         {
-            var page = get_page (i);
-            page.save (type, quality, make_indexed_file (file.get_uri (), i));
-            saving (i);
+            var encode_task = new EncodeTask ();
+            encode_task.number = i;
+            encode_task.page = book.get_page(i);
+            encoder.add ((owned) encode_task);
         }
+
+        /* Waiting for saving to finish */
+        yield;
+
+        /* Any error from any thread ends up here */
+        var error = writer.join ();
+        if (error != null)
+            throw error;
+
+        timer.stop ();
+        debug ("Save time: %f seconds", timer.elapsed (null));
     }
 
-    private void save_ps_pdf_surface (Cairo.Surface surface, Gdk.Pixbuf image, double dpi)
+    /* Those methods are run in the encoder threads pool. It process
+     * one encode_task issued by save_async and reissue the result with
+     * a write_task */
+
+    private void encode_png (owned EncodeTask encode_task)
     {
-        var context = new Cairo.Context (surface);
-        context.scale (72.0 / dpi, 72.0 / dpi);
-        Gdk.cairo_set_source_pixbuf (context, image, 0, 0);
-        context.get_source ().set_filter (Cairo.Filter.BEST);
-        context.paint ();
+        var page = encode_task.page;
+        var icc_data = page.get_icc_data_encoded ();
+        var write_task = new WriteTask ();
+        var image = page.get_image (true);
+
+        string[] keys = { "x-dpi", "y-dpi", "icc-profile", null };
+        string[] values = { "%d".printf (page.dpi), "%d".printf (page.dpi), icc_data, null };
+        if (icc_data == null)
+            keys[2] = null;
+
+        try
+        {
+            image.save_to_bufferv (out write_task.data, "png", keys, values);
+        }
+        catch (Error error)
+        {
+            write_task.error = error;
+        }
+        write_task.number = encode_task.number;
+        write_queue.push ((owned) write_task);
+
+        update_progression ();
     }
 
-    private void save_ps (File file) throws Error
+    private void encode_jpeg (owned EncodeTask encode_task)
     {
-        var stream = file.replace (null, false, FileCreateFlags.NONE, null);
-        var writer = new PsWriter (stream);
-        var surface = writer.surface;
+        var page = encode_task.page;
+        var icc_data = page.get_icc_data_encoded ();
+        var write_task = new WriteTask ();
+        var image = page.get_image (true);
 
-        for (var i = 0; i < n_pages; i++)
+        string[] keys = { "x-dpi", "y-dpi", "quality", "icc-profile", null };
+        string[] values = { "%d".printf (page.dpi), "%d".printf (page.dpi), "%d".printf (quality), icc_data, null };
+        if (icc_data == null)
+            keys[3] = null;
+
+        try
+        {
+            image.save_to_bufferv (out write_task.data, "jpeg", keys, values);
+        }
+        catch (Error error)
         {
-            var page = get_page (i);
-            var image = page.get_image (true);
-            var width = image.width * 72.0 / page.dpi;
-            var height = image.height * 72.0 / page.dpi;
-            surface.set_size (width, height);
-            save_ps_pdf_surface (surface, image, page.dpi);
-            surface.show_page ();
-            saving (i);
+            write_task.error = error;
         }
+        write_task.number = encode_task.number;
+        write_queue.push ((owned) write_task);
+
+        update_progression ();
     }
 
-    private uint8[]? compress_zlib (uint8[] data)
+#if HAVE_WEBP
+    private void encode_webp (owned EncodeTask encode_task)
     {
-        var stream = ZLib.DeflateStream (ZLib.Level.BEST_COMPRESSION);
-        var out_data = new uint8[data.length];
-
-        stream.next_in = data;
-        stream.next_out = out_data;
-        while (stream.avail_in > 0)
+        var page = encode_task.page;
+        var icc_data = page.get_icc_data_encoded ();
+        var write_task = new WriteTask ();
+        var image = page.get_image (true);
+        var webp_data = WebP.encode_rgb (image.get_pixels (),
+                                         image.get_width (),
+                                         image.get_height (),
+                                         image.get_rowstride (),
+                                         (float) quality);
+#if HAVE_COLORD
+        WebP.MuxError mux_error;
+        var mux = WebP.Mux.new_mux ();
+        uint8[] output;
+
+        mux_error = mux.set_image (webp_data, false);
+        debug ("mux.set_image: %s", mux_error.to_string ());
+
+        if (icc_data != null)
         {
-            if (stream.deflate (ZLib.Flush.FINISH) == ZLib.Status.STREAM_ERROR)
-                break;
+            mux_error = mux.set_chunk ("ICCP", icc_data.data, false);
+            debug ("mux.set_chunk: %s", mux_error.to_string ());
+            if (mux_error != WebP.MuxError.OK)
+                warning ("icc profile data not saved with page %i", encode_task.number);
         }
 
-        if (stream.avail_in > 0)
-            return null;
+        mux_error = mux.assemble (out output);
+        debug ("mux.assemble: %s", mux_error.to_string ());
+        if (mux_error != WebP.MuxError.OK)
+            write_task.error = new FileError.FAILED (_("Unable to encode page %i").printf (encode_task.number));
 
-        var n_written = data.length - stream.avail_out;
-        out_data.resize ((int) n_written);
+        write_task.data = (owned) output;
+#else
 
-        return out_data;
-    }
+        if (webp_data.length == 0)
+            write_task.error = new FileError.FAILED (_("Unable to encode page %i").printf (encode_task.number));
 
-    private ByteArray jpeg_data;
+        write_task.data = (owned) webp_data;
+#endif
+        write_task.number = encode_task.number;
+        write_queue.push ((owned) write_task);
 
-    private uint8[] compress_jpeg (Gdk.Pixbuf image, int quality, int dpi)
+        update_progression ();
+    }
+#endif
+
+    private void encode_pdf (owned EncodeTask encode_task)
     {
-        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 };
+        var page = encode_task.page;
+        var image = page.get_image (true);
+        var width = image.width;
+        var height = image.height;
+        unowned uint8[] pixels = image.get_pixels ();
+        int depth = 8;
+        string color_space = "DeviceRGB";
+        string? filter = null;
+        uint8[] data;
+
+        if (page.is_color)
+        {
+            depth = 8;
+            color_space = "DeviceRGB";
+            var data_length = height * width * 3;
+            data = new uint8[data_length];
+            for (var row = 0; row < height; row++)
+            {
+                var in_offset = row * image.rowstride;
+                var out_offset = row * width * 3;
+                for (var x = 0; x < width; x++)
+                {
+                    var in_o = in_offset + x*3;
+                    var out_o = out_offset + x*3;
+
+                    data[out_o] = pixels[in_o];
+                    data[out_o+1] = pixels[in_o+1];
+                    data[out_o+2] = pixels[in_o+2];
+                }
+            }
+        }
+        else if (page.depth == 2)
+        {
+            int shift_count = 6;
+            depth = 2;
+            color_space = "DeviceGray";
+            var data_length = height * ((width * 2 + 7) / 8);
+            data = new uint8[data_length];
+            var offset = 0;
+            for (var row = 0; row < height; row++)
+            {
+                /* Pad to the next line */
+                if (shift_count != 6)
+                {
+                    offset++;
+                    shift_count = 6;
+                }
+
+                var in_offset = row * image.rowstride;
+                for (var x = 0; x < width; x++)
+                {
+                    /* Clear byte */
+                    if (shift_count == 6)
+                        data[offset] = 0;
+
+                    /* Set bits */
+                    var p = pixels[in_offset + x*3];
+                    if (p >= 192)
+                        data[offset] |= 3 << shift_count;
+                    else if (p >= 128)
+                        data[offset] |= 2 << shift_count;
+                    else if (p >= 64)
+                        data[offset] |= 1 << shift_count;
+
+                    /* Move to the next position */
+                    if (shift_count == 0)
+                    {
+                        offset++;
+                        shift_count = 6;
+                    }
+                    else
+                        shift_count -= 2;
+                }
+            }
+        }
+        else if (page.depth == 1)
+        {
+            int mask = 0x80;
+
+            depth = 1;
+            color_space = "DeviceGray";
+            var data_length = height * ((width + 7) / 8);
+            data = new uint8[data_length];
+            var offset = 0;
+            for (var row = 0; row < height; row++)
+            {
+                /* Pad to the next line */
+                if (mask != 0x80)
+                {
+                    offset++;
+                    mask = 0x80;
+                }
+
+                var in_offset = row * image.rowstride;
+                for (var x = 0; x < width; x++)
+                {
+                    /* Clear byte */
+                    if (mask == 0x80)
+                        data[offset] = 0;
+
+                    /* Set bit */
+                    if (pixels[in_offset+x*3] != 0)
+                        data[offset] |= (uint8) mask;
+
+                    /* Move to the next bit */
+                    mask >>= 1;
+                    if (mask == 0)
+                    {
+                        offset++;
+                        mask = 0x80;
+                    }
+                }
+            }
+        }
+        else
+        {
+            depth = 8;
+            color_space = "DeviceGray";
+            var data_length = height * width;
+            data = new uint8 [data_length];
+            for (var row = 0; row < height; row++)
+            {
+                var in_offset = row * image.rowstride;
+                var out_offset = row * width;
+                for (var x = 0; x < width; x++)
+                    data[out_offset+x] = pixels[in_offset+x*3];
+            }
+        }
+
+        /* Compress data and use zlib compression if it is smaller than JPEG.
+         * zlib compression is slower in the worst case, so do JPEG first
+         * and stop zlib if it exceeds the JPEG size */
+        var write_task = new WriteTaskPDF ();
+        uint8[]? jpeg_data = null;
         try
         {
-            image.save_to_callbackv (write_pixbuf_data, "jpeg", keys, values);
+            jpeg_data = compress_jpeg (image, quality, page.dpi);
         }
-        catch (Error e)
+        catch (Error error)
+        {
+            write_task.error = error;
+        }
+        var zlib_data = compress_zlib (data, jpeg_data.length);
+        if (zlib_data != null)
         {
+            filter = "FlateDecode";
+            data = zlib_data;
+        }
+        else
+        {
+            filter = "DCTDecode";
+            data = jpeg_data;
         }
-        var data = (owned) jpeg_data.data;
-        jpeg_data = null;
 
-        return data;
+        write_task.number = encode_task.number;
+        write_task.data = data;
+        write_task.width = width;
+        write_task.height = height;
+        write_task.color_space = color_space;
+        write_task.depth = depth;
+        write_task.filter = filter;
+        write_task.dpi = page.dpi;
+        write_queue.push (write_task);
+
+        update_progression ();
     }
 
-    private bool write_pixbuf_data (uint8[] buf) throws Error
+    private Error? write_multifile ()
     {
-        jpeg_data.append (buf);
-        return true;
+        for (var i=0; i < n_pages; i++)
+        {
+            if (cancellable.is_cancelled ())
+            {
+                finished_saving ();
+                return null;
+            }
+
+            var write_task = write_queue.pop ();
+            if (write_task.error != null)
+            {
+                finished_saving ();
+                return write_task.error;
+            }
+
+            var indexed_file = make_indexed_file (file.get_uri (), write_task.number, n_pages);
+            try
+            {
+                var stream = indexed_file.replace (null, false, FileCreateFlags.NONE);
+                stream.write_all (write_task.data, null);
+            }
+            catch (Error error)
+            {
+                finished_saving ();
+                return error;
+            }
+        }
+
+        update_progression ();
+        finished_saving ();
+        return null;
     }
 
-    private void save_pdf (File file, int quality) throws Error
+    /* Those methods are run in the writer thread. It receive all
+     * write_tasks sent to it by the encoder threads and write those to
+     * disk. */
+
+    private Error? write_pdf ()
     {
         /* Generate a random ID for this file */
         var id = "";
         for (var i = 0; i < 4; i++)
             id += "%08x".printf (Random.next_int ());
 
-        var stream = file.replace (null, false, FileCreateFlags.NONE, null);
+        FileOutputStream? stream = null;
+        try
+        {
+            stream = file.replace (null, false, FileCreateFlags.NONE, null);
+        }
+        catch (Error error)
+        {
+            finished_saving ();
+            return error;
+        }
         var writer = new PDFWriter (stream);
 
         /* Choose object numbers */
@@ -345,163 +653,41 @@ public class Book
         writer.write_string (">>\n");
         writer.write_string ("endobj\n");
 
-        for (var i = 0; i < n_pages; i++)
+        /* Process each page in order */
+        var tasks_in_standby = new Queue<WriteTaskPDF> ();
+        for (int i = 0; i < n_pages; i++)
         {
-            var page = get_page (i);
-            var image = page.get_image (true);
-            var width = image.width;
-            var height = image.height;
-            unowned uint8[] pixels = image.get_pixels ();
-            var page_width = width * 72.0 / page.dpi;
-            var page_height = height * 72.0 / page.dpi;
-
-            int depth = 8;
-            string color_space = "DeviceRGB";
-            string? filter = null;
-            char[] width_buffer = new char[double.DTOSTR_BUF_SIZE];
-            char[] height_buffer = new char[double.DTOSTR_BUF_SIZE];
-            uint8[] data;
-            if (page.is_color)
+            if (cancellable.is_cancelled ())
             {
-                depth = 8;
-                color_space = "DeviceRGB";
-                var data_length = height * width * 3;
-                data = new uint8[data_length];
-                for (var row = 0; row < height; row++)
-                {
-                    var in_offset = row * image.rowstride;
-                    var out_offset = row * width * 3;
-                    for (var x = 0; x < width; x++)
-                    {
-                        var in_o = in_offset + x*3;
-                        var out_o = out_offset + x*3;
-
-                        data[out_o] = pixels[in_o];
-                        data[out_o+1] = pixels[in_o+1];
-                        data[out_o+2] = pixels[in_o+2];
-                    }
-                }
+                finished_saving ();
+                return null;
             }
-            else if (page.depth == 2)
-            {
-                int shift_count = 6;
-                depth = 2;
-                color_space = "DeviceGray";
-                var data_length = height * ((width * 2 + 7) / 8);
-                data = new uint8[data_length];
-                var offset = 0;
-                for (var row = 0; row < height; row++)
-                {
-                    /* Pad to the next line */
-                    if (shift_count != 6)
-                    {
-                        offset++;
-                        shift_count = 6;
-                    }
 
-                    var in_offset = row * image.rowstride;
-                    for (var x = 0; x < width; x++)
-                    {
-                        /* Clear byte */
-                        if (shift_count == 6)
-                            data[offset] = 0;
-
-                        /* Set bits */
-                        var p = pixels[in_offset + x*3];
-                        if (p >= 192)
-                            data[offset] |= 3 << shift_count;
-                        else if (p >= 128)
-                            data[offset] |= 2 << shift_count;
-                        else if (p >= 64)
-                            data[offset] |= 1 << shift_count;
-
-                        /* Move to the next position */
-                        if (shift_count == 0)
-                        {
-                            offset++;
-                            shift_count = 6;
-                        }
-                        else
-                            shift_count -= 2;
-                    }
-                }
-            }
-            else if (page.depth == 1)
-            {
-                int mask = 0x80;
-
-                depth = 1;
-                color_space = "DeviceGray";
-                var data_length = height * ((width + 7) / 8);
-                data = new uint8[data_length];
-                var offset = 0;
-                for (var row = 0; row < height; row++)
-                {
-                    /* Pad to the next line */
-                    if (mask != 0x80)
-                    {
-                        offset++;
-                        mask = 0x80;
-                    }
-
-                    var in_offset = row * image.rowstride;
-                    for (var x = 0; x < width; x++)
-                    {
-                        /* Clear byte */
-                        if (mask == 0x80)
-                            data[offset] = 0;
-
-                        /* Set bit */
-                        if (pixels[in_offset+x*3] != 0)
-                            data[offset] |= (uint8) mask;
-
-                        /* Move to the next bit */
-                        mask >>= 1;
-                        if (mask == 0)
-                        {
-                            offset++;
-                            mask = 0x80;
-                        }
-                    }
-                }
-            }
+            var write_task = tasks_in_standby.peek_head ();
+            if (write_task != null && write_task.number == i)
+                tasks_in_standby.pop_head ();
             else
             {
-                depth = 8;
-                color_space = "DeviceGray";
-                var data_length = height * width;
-                data = new uint8 [data_length];
-                for (var row = 0; row < height; row++)
+                while (true)
                 {
-                    var in_offset = row * image.rowstride;
-                    var out_offset = row * width;
-                    for (var x = 0; x < width; x++)
-                        data[out_offset+x] = pixels[in_offset+x*3];
-                }
-            }
-
-            /* Compress data */
-            var compressed_data = compress_zlib (data);
-            if (compressed_data != null)
-            {
-                /* Try if JPEG compression is better */
-                if (depth > 1)
-                {
-                    var jpeg_data = compress_jpeg (image, quality, page.dpi);
-                    if (jpeg_data.length < compressed_data.length)
+                    write_task = (WriteTaskPDF) write_queue.pop ();
+                    if (write_task.error != null)
                     {
-                        filter = "DCTDecode";
-                        data = jpeg_data;
+                        finished_saving ();
+                        return write_task.error;
                     }
-                }
+                    if (write_task.number == i)
+                        break;
 
-                if (filter == null)
-                {
-                    filter = "FlateDecode";
-                    data = compressed_data;
+                    tasks_in_standby.insert_sorted (write_task, (a, b) => {return a.number - b.number;});
                 }
             }
 
+            var page_width = write_task.width * 72.0 / write_task.dpi;
+            var page_height = write_task.height * 72.0 / write_task.dpi;
+            var width_buffer = new char[double.DTOSTR_BUF_SIZE];
+            var height_buffer = new char[double.DTOSTR_BUF_SIZE];
+
             /* Page */
             writer.write_string ("\n");
             writer.start_object (page_numbers[i]);
@@ -522,16 +708,16 @@ public class Book
             writer.write_string ("<<\n");
             writer.write_string ("/Type /XObject\n");
             writer.write_string ("/Subtype /Image\n");
-            writer.write_string ("/Width %d\n".printf (width));
-            writer.write_string ("/Height %d\n".printf (height));
-            writer.write_string ("/ColorSpace /%s\n".printf (color_space));
-            writer.write_string ("/BitsPerComponent %d\n".printf (depth));
-            writer.write_string ("/Length %d\n".printf (data.length));
-            if (filter != null)
-                writer.write_string ("/Filter /%s\n".printf (filter));
+            writer.write_string ("/Width %d\n".printf (write_task.width));
+            writer.write_string ("/Height %d\n".printf (write_task.height));
+            writer.write_string ("/ColorSpace /%s\n".printf (write_task.color_space));
+            writer.write_string ("/BitsPerComponent %d\n".printf (write_task.depth));
+            writer.write_string ("/Length %d\n".printf (write_task.data.length));
+            if (write_task.filter != null)
+                writer.write_string ("/Filter /%s\n".printf (write_task.filter));
             writer.write_string (">>\n");
             writer.write_string ("stream\n");
-            writer.write (data);
+            writer.write (write_task.data);
             writer.write_string ("\n");
             writer.write_string ("endstream\n");
             writer.write_string ("endobj\n");
@@ -541,7 +727,7 @@ public class Book
             writer.start_object (struct_tree_root_number);
             writer.write_string ("%u 0 obj\n".printf (struct_tree_root_number));
             writer.write_string ("<<\n");
-            writer.write_string ("/Type /StructTreeRoot\n");            
+            writer.write_string ("/Type /StructTreeRoot\n");
             writer.write_string (">>\n");
             writer.write_string ("endobj\n");
 
@@ -558,8 +744,6 @@ public class Book
             writer.write_string ("\n");
             writer.write_string ("endstream\n");
             writer.write_string ("endobj\n");
-
-            saving (i);
         }
 
         /* Info */
@@ -576,10 +760,10 @@ public class Book
         var xref_offset = writer.offset;
         writer.write_string ("xref\n");
         writer.write_string ("0 %zu\n".printf (writer.object_offsets.length + 1));
-        writer.write_string ("%010zu 65535 f \n".printf (next_empty_object (writer, 0)));
+        writer.write_string ("%010zu 65535 f \n".printf (writer.next_empty_object (0)));
         for (var i = 0; i < writer.object_offsets.length; i++)
             if (writer.object_offsets[i] == 0)
-                writer.write_string ("%010zu 65535 f \n".printf (next_empty_object (writer, i + 1)));
+                writer.write_string ("%010zu 65535 f \n".printf (writer.next_empty_object (i + 1)));
             else
                 writer.write_string ("%010zu 00000 n \n".printf (writer.object_offsets[i]));
 
@@ -595,35 +779,102 @@ public class Book
         writer.write_string ("startxref\n");
         writer.write_string ("%zu\n".printf (xref_offset));
         writer.write_string ("%%EOF\n");
+
+        update_progression ();
+        finished_saving ();
+        return null;
     }
 
-    static int next_empty_object (PDFWriter writer, int start)
+    /* update_progression is called once by page by encoder threads and
+     * once at the end by writer thread. */
+    private void update_progression ()
     {
-        for (var i = start; i < writer.object_offsets.length; i++)
-            if (writer.object_offsets[i] == 0)
-                return i + 1;
-        return 0;
+        double step = 1.0 / (double)(n_pages+1);
+        progression_mutex.lock ();
+        progression += step;
+        progression_mutex.unlock ();
+        Idle.add (() =>
+        {
+            progression_callback (progression);
+            return false;
+        });
     }
 
-    public void save (string type, int quality, File file) throws Error
+    /* finished_saving is called by the writer thread when it's done,
+     * meaning there is nothing left to do or saving has been
+     * cancelled */
+    private void finished_saving ()
     {
-        switch (type)
+        /* At this point, any remaining encode_task ought to remain unprocessed */
+        ThreadPool.free ((owned) encoder, true, true);
+
+        /* Wake-up save_async method in main thread */
+        Idle.add ((owned)save_async_callback);
+    }
+
+    /* Utility methods */
+
+    private static uint8[]? compress_zlib (uint8[] data, uint max_size)
+    {
+        var stream = ZLib.DeflateStream (ZLib.Level.BEST_COMPRESSION);
+        var out_data = new uint8[max_size];
+
+        stream.next_in = data;
+        stream.next_out = out_data;
+        while (true)
         {
-        case "jpeg":
-        case "png":
-        case "tiff":
-            save_multi_file (type, quality, file);
-            break;
-        case "ps":
-            save_ps (file);
-            break;
-        case "pdf":
-            save_pdf (file, quality);
-            break;
+            /* Compression complete */
+            if (stream.avail_in == 0)
+                break;
+
+            /* Out of space */
+            if (stream.avail_out == 0)
+                return null;
+
+            if (stream.deflate (ZLib.Flush.FINISH) == ZLib.Status.STREAM_ERROR)
+                return null;
         }
+
+        var n_written = out_data.length - stream.avail_out;
+        out_data.resize ((int) n_written);
+
+        return out_data;
+    }
+
+    private static uint8[] compress_jpeg (Gdk.Pixbuf image, int quality, int dpi) throws Error
+    {
+        uint8[] jpeg_data;
+        string[] keys = { "quality", "x-dpi", "y-dpi", null };
+        string[] values = { "%d".printf (quality), "%d".printf (dpi), "%d".printf (dpi), null };
+
+        image.save_to_bufferv (out jpeg_data, "jpeg", keys, values);
+        return jpeg_data;
     }
 }
 
+private class EncodeTask
+{
+    public int number;
+    public Page page;
+}
+
+private class WriteTask
+{
+    public int number;
+    public uint8[] data;
+    public Error error;
+}
+
+private class WriteTaskPDF : WriteTask
+{
+    public int width;
+    public int height;
+    public string color_space;
+    public int depth;
+    public string? filter;
+    public int dpi;
+}
+
 private class PDFWriter
 {
     public size_t offset = 0;
@@ -666,31 +917,32 @@ private class PDFWriter
     {
         object_offsets[index - 1] = (uint)offset;
     }
-}
-
-public class PsWriter
-{
-    public Cairo.PsSurface surface;
-    public FileOutputStream stream;
 
-    public PsWriter (FileOutputStream stream)
+    public int next_empty_object (int start)
     {
-        this.stream = stream;
-        surface = new Cairo.PsSurface.for_stream (write_cairo_data, 0, 0);
+        for (var i = start; i < object_offsets.length; i++)
+            if (object_offsets[i] == 0)
+                return i + 1;
+        return 0;
     }
+}
 
-    private Cairo.Status write_cairo_data (uint8[] data)
+public File make_indexed_file (string uri, uint i, uint n_pages)
+{
+    if (n_pages == 1)
+        return File.new_for_uri (uri);
+
+    /* Insert index before extension */
+    var basename = Path.get_basename (uri);
+    string prefix = uri, suffix = "";
+    var extension_index = basename.last_index_of_char ('.');
+    if (extension_index >= 0)
     {
-        try
-        {
-            stream.write_all (data, null, null);
-        }
-        catch (Error e)
-        {
-            warning ("Error writing data: %s", e.message);
-            return Cairo.Status.WRITE_ERROR;
-        }
-
-        return Cairo.Status.SUCCESS;
+        suffix = basename.slice (extension_index, basename.length);
+        prefix = uri.slice (0, uri.length - suffix.length);
     }
+    var width = 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);
 }
diff --git a/src/colord.vapi b/src/colord.vapi
deleted file mode 100644
index 817673f..0000000
--- a/src/colord.vapi
+++ /dev/null
@@ -1,17 +0,0 @@
-[CCode (cprefix = "Cd", lower_case_cprefix = "cd_", cheader_filename = "colord.h")]
-namespace Colord {
-	public class Client : GLib.Object {
-        public Client ();
-		public bool connect_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public Device find_device_by_property_sync (string key, string value, GLib.Cancellable? cancellable = null) throws GLib.Error;
-	}
-	public class Device : GLib.Object {
-		public bool connect_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public Profile? get_default_profile ();
-	}
-	public class Profile : GLib.Object {
-		public bool connect_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public string? filename { get; }
-	}
-	public const string DEVICE_PROPERTY_SERIAL;
-}
diff --git a/src/fixes.vapi b/src/fixes.vapi
deleted file mode 100644
index b83c36c..0000000
--- a/src/fixes.vapi
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace GUsb {
-	/* Fixed in 0.2.7: https://github.com/hughsie/libgusb/commit/83a6b1a20653c1a17f0a909f08652b5e1df44075 */
-	public GLib.GenericArray<GUsb.Device> context_get_devices (GUsb.Context context);
-}
diff --git a/src/help-overlay.ui b/src/help-overlay.ui
new file mode 100644
index 0000000..dabec9f
--- /dev/null
+++ b/src/help-overlay.ui
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.17 -->
+  <object class="GtkShortcutsWindow" id="help_overlay">
+    <property name="modal">1</property>
+    <child>
+      <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes" context="shortcut window">Scanning</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;1</property>
+                <property name="title" translatable="yes" context="shortcut window">Scan a single page</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;f</property>
+                <property name="title" translatable="yes" context="shortcut window">Scan all pages from document feeder</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;m</property>
+                <property name="title" translatable="yes" context="shortcut window">Scan continuously from a flatbed scanner</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">Escape</property>
+                <property name="title" translatable="yes" context="shortcut window">Stop scan in progress</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes" context="shortcut window">Document Modification</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">less</property>
+                <property name="title" translatable="yes" context="shortcut window">Move page left</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">greater</property>
+                <property name="title" translatable="yes" context="shortcut window">Move page right</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">bracketleft</property>
+                <property name="title" translatable="yes" context="shortcut window">Rotate page to the left (anti-clockwise)</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">bracketright</property>
+                <property name="title" translatable="yes" context="shortcut window">Rotate page to the right (clockwise)</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">Delete</property>
+                <property name="title" translatable="yes" context="shortcut window">Delete page</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes" context="shortcut window">Document Management</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;n</property>
+                <property name="title" translatable="yes" context="shortcut window">Start new document</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;s</property>
+                <property name="title" translatable="yes" context="shortcut window">Save scanned document</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;e</property>
+                <property name="title" translatable="yes" context="shortcut window">Email scanned document</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;p</property>
+                <property name="title" translatable="yes" context="shortcut window">Print scanned document</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;c</property>
+                <property name="title" translatable="yes" context="shortcut window">Copy current page to clipboard</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/src/libwebp.vapi b/src/libwebp.vapi
new file mode 100644
index 0000000..74bfdd5
--- /dev/null
+++ b/src/libwebp.vapi
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2017 Stéphane Fillion
+ * Authors: Stéphane Fillion <stphanef3724@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 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.
+ */
+
+namespace WebP
+{
+    // Returns the size of the compressed data (pointed to by *output), or 0 if
+    // an error occurred. The compressed data must be released by the caller
+    // using the call 'free(*output)'.
+    // These functions compress using the lossy format, and the quality_factor
+    // can go from 0 (smaller output, lower quality) to 100 (best quality,
+    // larger output).
+    [CCode (cheader_filename = "webp/encode.h", cname = "WebPEncodeRGB")]
+    private size_t _encode_rgb ([CCode (array_length = false)] uint8[] rgb,
+                                int width,
+                                int height,
+                                int stride,
+                                float quality_factor,
+                                [CCode (array_length = false)] out uint8[] output);
+    [CCode (cname = "vala_encode_rgb")]
+    public uint8[] encode_rgb (uint8[] rgb, int width, int height, int stride, float quality_factor)
+    {
+        uint8[] output;
+        size_t length;
+        length = _encode_rgb (rgb, width, height, stride, quality_factor, out output);
+        output.length = (int) length;
+        return output;
+    }
+
+    // These functions are the equivalent of the above, but compressing in a
+    // lossless manner. Files are usually larger than lossy format, but will
+    // not suffer any compression loss.
+    [CCode (cheader_filename = "webp/encode.h", cname = "WebPEncodeLosslessRGB")]
+    private size_t _encode_lossless_rgb ([CCode (array_length = false)] uint8[] rgb,
+                                         int width,
+                                         int height,
+                                         int stride,
+                                         [CCode (array_length = false)] out uint8[] output);
+    [CCode (cname = "vala_encode_lossless_rgb")]
+    public uint8[] encode_lossless_rgb (uint8[] rgb, int width, int height, int stride)
+    {
+        uint8[] output;
+        size_t length;
+        length = _encode_lossless_rgb (rgb, width, height, stride, out output);
+        output.length = (int) length;
+        return output;
+    }
+}
diff --git a/src/libwebpmux.vapi b/src/libwebpmux.vapi
new file mode 100644
index 0000000..f2461a2
--- /dev/null
+++ b/src/libwebpmux.vapi
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2017 Stéphane Fillion
+ * Authors: Stéphane Fillion <stphanef3724@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 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.
+ */
+
+namespace WebP
+{
+    // Error codes
+    [CCode (cheader_filename = "webp/mux.h", cname = "WebPMuxError", cprefix = "WEBP_MUX_", has_type_id = false)]
+    public enum MuxError
+    {
+        OK                 =  1,
+        NOT_FOUND          =  0,
+        INVALID_ARGUMENT   = -1,
+        BAD_DATA           = -2,
+        MEMORY_ERROR       = -3,
+        NOT_ENOUGH_DATA    = -4
+    }
+
+    // Data type used to describe 'raw' data, e.g., chunk data
+    // (ICC profile, metadata) and WebP compressed image data.
+    [CCode (cheader_filename = "webp/mux.h", cname = "WebPData", destroy_function = "", has_type_id = false)]
+    private struct Data
+    {
+        [CCode (array_length = false)] unowned uint8[] bytes;
+        size_t size;
+    }
+
+    // main opaque object.
+    [CCode (cheader_filename = "webp/mux.h", cname = "WebPMux", free_function = "WebPMuxDelete")]
+    [Compact]
+    public class Mux
+    {
+        // Creates an empty mux object.
+        // Returns:
+        //   A pointer to the newly created empty mux object.
+        //   Or NULL in case of memory error.
+        [CCode (cname = "WebPMuxNew")]
+        public static Mux? new_mux ();
+
+        // Sets the (non-animated and non-fragmented) image in the mux object.
+        // Note: Any existing images (including frames/fragments) will be removed.
+        // Parameters:
+        //   mux - (in/out) object in which the image is to be set
+        //   bitstream - (in) can be a raw VP8/VP8L bitstream or a single-image
+        //               WebP file (non-animated and non-fragmented)
+        //   copy_data - (in) value 1 indicates given data WILL be copied to the mux
+        //               object and value 0 indicates data will NOT be copied.
+        // Returns:
+        //   WEBP_MUX_INVALID_ARGUMENT - if mux is NULL or bitstream is NULL.
+        //   WEBP_MUX_MEMORY_ERROR - on memory allocation error.
+        //   WEBP_MUX_OK - on success.
+        [CCode (cname = "WebPMuxSetImage")]
+        private MuxError _set_image (Data bitstream, bool copy_data);
+        [CCode (cname = "vala_set_image")]
+        public MuxError set_image (uint8[] bitstream, bool copy_data)
+        {
+                Data data;
+                data.bytes = bitstream;
+                data.size = bitstream.length;
+                return _set_image (data, copy_data);
+        }
+
+        // Adds a chunk with id 'fourcc' and data 'chunk_data' in the mux object.
+        // Any existing chunk(s) with the same id will be removed.
+        // Parameters:
+        //   mux - (in/out) object to which the chunk is to be added
+        //   fourcc - (in) a character array containing the fourcc of the given chunk;
+        //                 e.g., "ICCP", "XMP ", "EXIF" etc.
+        //   chunk_data - (in) the chunk data to be added
+        //   copy_data - (in) value 1 indicates given data WILL be copied to the mux
+        //               object and value 0 indicates data will NOT be copied.
+        // Returns:
+        //   WEBP_MUX_INVALID_ARGUMENT - if mux, fourcc or chunk_data is NULL
+        //                               or if fourcc corresponds to an image chunk.
+        //   WEBP_MUX_MEMORY_ERROR - on memory allocation error.
+        //   WEBP_MUX_OK - on success.
+        [CCode (cname = "WebPMuxSetChunk")]
+        private MuxError _set_chunk ([CCode (array_length = false)] uchar[] fourcc,
+                                     Data chunk_data,
+                                     bool copy_data);
+        [CCode (cname = "vala_set_chunk")]
+        public MuxError set_chunk (string fourcc, uint8[] chunk_data, bool copy_data)
+        requires (fourcc.length == 4)
+        {
+            Data data;
+            data.bytes = chunk_data;
+            data.size = chunk_data.length;
+            return _set_chunk ((uchar[]) fourcc, data, copy_data);
+        }
+
+        // Assembles all chunks in WebP RIFF format and returns in 'assembled_data'.
+        // This function also validates the mux object.
+        // Note: The content of 'assembled_data' will be ignored and overwritten.
+        // Also, the content of 'assembled_data' is allocated using malloc(), and NOT
+        // owned by the 'mux' object. It MUST be deallocated by the caller by calling
+        // WebPDataClear(). It's always safe to call WebPDataClear() upon return,
+        // even in case of error.
+        // Parameters:
+        //   mux - (in/out) object whose chunks are to be assembled
+        //   assembled_data - (out) assembled WebP data
+        // Returns:
+        //   WEBP_MUX_BAD_DATA - if mux object is invalid.
+        //   WEBP_MUX_INVALID_ARGUMENT - if mux or assembled_data is NULL.
+        //   WEBP_MUX_MEMORY_ERROR - on memory allocation error.
+        //   WEBP_MUX_OK - on success.
+        [CCode (cname = "WebPMuxAssemble")]
+        private MuxError _assemble (out Data assembled_data);
+        [CCode (cname = "vala_assemble")]
+        public MuxError assemble (out uint8[] assembled_data)
+        {
+            Data data;
+            MuxError mux_error;
+            unowned uint8[] out_array;
+            mux_error = _assemble (out data);
+            out_array = data.bytes;
+            out_array.length = (int) data.size;
+            assembled_data = out_array;
+            return mux_error;
+        }
+    }
+}
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 0000000..9e40e42
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,41 @@
+resources = gnome.compile_resources ('resources', 'simple-scan.gresource.xml',
+                                     source_dir: '.',
+                                     c_name: 'resources')
+
+vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ]
+dependencies = [ glib_dep, gtk_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ]
+if colord_dep.found ()
+    vala_args += [ '-D', 'HAVE_COLORD' ]
+    dependencies += colord_dep
+endif
+if packagekit_dep.found ()
+    vala_args += [ '-D', 'HAVE_PACKAGEKIT' ]
+    dependencies += packagekit_dep
+endif
+if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord
+    vala_args += [ '-D', 'HAVE_WEBP' ]
+    dependencies += [ webp_dep, webpmux_dep ]
+endif
+
+simple_scan = executable ('simple-scan',
+                          [ 'config.vapi',
+                            'app-window.vala',
+                            'authorize-dialog.vala',
+                            'book.vala',
+                            'book-view.vala',
+                            'page.vala',
+                            'page-view.vala',
+                            'preferences-dialog.vala',
+                            'simple-scan.vala',
+                            'scanner.vala',
+                            'screensaver.vala',
+                            'autosave-manager.vala' ] + resources,
+                          dependencies: dependencies,
+                          vala_args: vala_args,
+                          c_args: [ '-DVERSION="@0@"'.format (meson.project_version ()),
+                                    '-DGETTEXT_PACKAGE="simple-scan"',
+                                    '-DLOCALE_DIR="@0@"'.format (localedir),
+                                    '-DICON_DIR="@0@"'.format (icondir),
+                                    '-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE' ],
+                          link_args: [ '-lm' ],
+                          install: true )
diff --git a/src/packagekit-glib2.vapi b/src/packagekit-glib2.vapi
deleted file mode 100644
index 66c3907..0000000
--- a/src/packagekit-glib2.vapi
+++ /dev/null
@@ -1,1371 +0,0 @@
-/* packagekit-glib2.vapi generated by vapigen-0.28, do not modify. */
-
-[CCode (cprefix = "Pk", gir_namespace = "PackageKitGlib", gir_version = "1.0", lower_case_cprefix = "pk_")]
-namespace Pk {
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_category_get_type ()")]
-	public class Category : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public Category ();
-		public unowned string get_icon ();
-		public unowned string get_id ();
-		public unowned string get_name ();
-		public unowned string get_parent_id ();
-		public unowned string get_summary ();
-		public void set_icon (string icon);
-		public void set_id (string cat_id);
-		public void set_name (string name);
-		public void set_parent_id (string parent_id);
-		public void set_summary (string summary);
-		[NoAccessorMethod]
-		public string cat_id { owned get; set; }
-		public string icon { get; set; }
-		public string name { get; set; }
-		public string parent_id { get; set; }
-		public string summary { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_client_get_type ()")]
-	public class Client : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Client ();
-		public Pk.Results accept_eula (string eula_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results accept_eula_async (string eula_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results adopt (string transaction_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results adopt_async (string transaction_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[NoWrapper]
-		public virtual void changed ();
-		public Pk.Results depends_on (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results depends_on_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results download_packages ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, string directory, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results download_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, string directory, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public bool get_background ();
-		public uint get_cache_age ();
-		public Pk.Results get_categories (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_categories_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_details ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_details_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_details_local ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_details_local_async ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_distro_upgrades (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_distro_upgrades_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_files ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_files_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_files_local ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_files_local_async ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public bool get_idle ();
-		public bool get_interactive ();
-		public unowned string get_locale ();
-		public Pk.Results get_old_transactions (uint number, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_old_transactions_async (uint number, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_packages (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_packages_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Progress get_progress (string transaction_id, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async Pk.Progress get_progress_async (string transaction_id, GLib.Cancellable? cancellable) throws GLib.Error;
-		public Pk.Results get_repo_list (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_repo_list_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_update_detail ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_update_detail_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_updates (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results get_updates_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results install_files (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results install_files_async (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results install_packages (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results install_packages_async (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results install_signature (Pk.SigType type, string key_id, string package_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results install_signature_async (Pk.SigType type, string key_id, string package_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results refresh_cache (bool force, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results refresh_cache_async (bool force, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results remove_packages (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool allow_deps, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results remove_packages_async (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool allow_deps, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results repair_system (Pk.Bitfield transaction_flags, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results repair_system_async (Pk.Bitfield transaction_flags, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results repo_enable (string repo_id, bool enabled, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results repo_enable_async (string repo_id, bool enabled, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results repo_remove (Pk.Bitfield transaction_flags, string repo_id, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results repo_remove_async (Pk.Bitfield transaction_flags, string repo_id, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results repo_set_data (string repo_id, string parameter, string value, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results repo_set_data_async (string repo_id, string parameter, string value, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results required_by (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results required_by_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results resolve (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] packages, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results resolve_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] packages, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results search_details (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results search_details_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results search_files (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results search_files_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results search_groups (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results search_groups_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results search_names (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results search_names_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public void set_background (bool background);
-		public void set_cache_age (uint cache_age);
-		public void set_interactive (bool interactive);
-		public void set_locale (string locale);
-		public static void test (void* user_data);
-		public Pk.Results update_packages (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results update_packages_async (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results what_provides (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_client_generic_finish")]
-		public async Pk.Results what_provides_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public bool background { get; set; }
-		public uint cache_age { get; set; }
-		public bool idle { get; }
-		public bool interactive { get; set; }
-		public string locale { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_client_helper_get_type ()")]
-	public class ClientHelper : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public ClientHelper ();
-		public bool start (string socket_filename, string argv, string envp) throws GLib.Error;
-		public bool stop () throws GLib.Error;
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_control_get_type ()")]
-	public class Control : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Control ();
-		public async Pk.Authorize can_authorize_async (string action_id, GLib.Cancellable? cancellable) throws GLib.Error;
-		[NoWrapper]
-		public virtual void connection_changed (bool connected);
-		public async string get_daemon_state_async (GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool get_properties (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async bool get_properties_async (GLib.Cancellable? cancellable) throws GLib.Error;
-		public async string get_tid_async (GLib.Cancellable? cancellable) throws GLib.Error;
-		public async uint get_time_since_action_async (Pk.Role role, GLib.Cancellable? cancellable) throws GLib.Error;
-		[CCode (array_length = false, array_null_terminated = true)]
-		public string[] get_transaction_list (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		[CCode (array_length = false, array_null_terminated = true)]
-		public async string[] get_transaction_list_async (GLib.Cancellable? cancellable) throws GLib.Error;
-		[NoWrapper]
-		public virtual void network_state_changed ();
-		public bool set_proxy (string proxy_http, string proxy_ftp, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool set_proxy2 (string proxy_http, string proxy_https, string proxy_ftp, string proxy_socks, string no_proxy, string pac, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async void set_proxy2_async (string proxy_http, string proxy_https, string proxy_ftp, string proxy_socks, string no_proxy, string pac, GLib.Cancellable? cancellable);
-		public async bool set_proxy_async (string proxy_http, string proxy_ftp, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool suggest_daemon_quit (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async bool suggest_daemon_quit_async (GLib.Cancellable? cancellable) throws GLib.Error;
-		public static void test (void* user_data);
-		[NoAccessorMethod]
-		public string backend_author { owned get; set; }
-		[NoAccessorMethod]
-		public string backend_description { owned get; set; }
-		[NoAccessorMethod]
-		public string backend_name { owned get; set; }
-		[NoAccessorMethod]
-		public bool connected { get; set; }
-		[NoAccessorMethod]
-		public string distro_id { owned get; set; }
-		[NoAccessorMethod]
-		public uint64 filters { get; set; }
-		[NoAccessorMethod]
-		public uint64 groups { get; set; }
-		[NoAccessorMethod]
-		public virtual bool locked { get; set; }
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] mime_types { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.Network network_state { get; set; }
-		[NoAccessorMethod]
-		public uint64 provides { get; set; }
-		[NoAccessorMethod]
-		public uint64 roles { get; set; }
-		[NoAccessorMethod]
-		public uint version_major { get; }
-		[NoAccessorMethod]
-		public uint version_micro { get; }
-		[NoAccessorMethod]
-		public uint version_minor { get; }
-		public virtual signal void repo_list_changed ();
-		public virtual signal void restart_schedule ();
-		public virtual signal void transaction_list_changed ([CCode (array_length = false, array_null_terminated = true)] string[] transaction_ids);
-		public virtual signal void updates_changed ();
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_desktop_get_type ()")]
-	public class Desktop : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Desktop ();
-		public GLib.GenericArray<weak string> get_files_for_package (string package) throws GLib.Error;
-		public string get_package_for_file (string filename) throws GLib.Error;
-		public GLib.GenericArray<weak string> get_shown_for_package (string package) throws GLib.Error;
-		public bool open_database () throws GLib.Error;
-		public static void test (void* user_data);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_details_get_type ()")]
-	public class Details : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public Details ();
-		public unowned string get_description ();
-		public Pk.Group get_group ();
-		public unowned string get_license ();
-		public unowned string get_package_id ();
-		public uint64 get_size ();
-		public unowned string get_summary ();
-		public unowned string get_url ();
-		[NoAccessorMethod]
-		public string description { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.Group group { get; set; }
-		[NoAccessorMethod]
-		public string license { owned get; set; }
-		[NoAccessorMethod]
-		public string package_id { owned get; set; }
-		[NoAccessorMethod]
-		public uint64 size { get; set; }
-		[NoAccessorMethod]
-		public string summary { owned get; set; }
-		[NoAccessorMethod]
-		public string url { owned get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_distro_upgrade_get_type ()")]
-	public class DistroUpgrade : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public DistroUpgrade ();
-		public unowned string get_id ();
-		public Pk.DistroUpgradeEnum get_state ();
-		public unowned string get_summary ();
-		[NoAccessorMethod]
-		public string name { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.DistroUpgradeEnum state { get; set; }
-		[NoAccessorMethod]
-		public string summary { owned get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_error_get_type ()")]
-	public class Error : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public Error ();
-		public Pk.ErrorEnum get_code ();
-		public unowned string get_details ();
-		[NoAccessorMethod]
-		public Pk.ErrorEnum code { get; set; }
-		[NoAccessorMethod]
-		public string details { owned get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_eula_required_get_type ()")]
-	public class EulaRequired : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public EulaRequired ();
-		[NoAccessorMethod]
-		public string eula_id { owned get; set; }
-		[NoAccessorMethod]
-		public string license_agreement { owned get; set; }
-		[NoAccessorMethod]
-		public string package_id { owned get; set; }
-		[NoAccessorMethod]
-		public string vendor_name { owned get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_files_get_type ()")]
-	public class Files : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public Files ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_files ();
-		public unowned string get_package_id ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] files { owned get; set; }
-		[NoAccessorMethod]
-		public string package_id { owned get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_item_progress_get_type ()")]
-	public class ItemProgress : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public ItemProgress ();
-		public unowned string get_package_id ();
-		public uint get_percentage ();
-		public Pk.Status get_status ();
-		[NoAccessorMethod]
-		public string package_id { owned get; set; }
-		[NoAccessorMethod]
-		public uint percentage { get; set; }
-		[NoAccessorMethod]
-		public uint status { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_media_change_required_get_type ()")]
-	public class MediaChangeRequired : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public MediaChangeRequired ();
-		[NoAccessorMethod]
-		public string media_id { owned get; set; }
-		[NoAccessorMethod]
-		public string media_text { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.MediaType media_type { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_package_get_type ()")]
-	public class Package : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public Package ();
-		public bool equal (Pk.Package package2);
-		public bool equal_id (Pk.Package package2);
-		public unowned string get_arch ();
-		public unowned string get_data ();
-		public unowned string get_id ();
-		public Pk.Info get_info ();
-		public unowned string get_name ();
-		public unowned string get_summary ();
-		public unowned string get_version ();
-		public static string id_build (string name, string version, string arch, string data);
-		public static bool id_check (string package_id);
-		public static bool id_equal_fuzzy_arch (string package_id1, string package_id2);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public static string[] id_split (string package_id);
-		public static void id_test (void* user_data);
-		public static string id_to_printable (string package_id);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public static string[] ids_add_id (string package_ids, string package_id);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public static string[] ids_add_ids (string package_ids, string package_ids_new);
-		public static bool ids_check (string package_ids);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public static string[] ids_from_id (string package_id);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public static string[] ids_from_string (string package_id);
-		public static bool ids_present_id (string package_ids, string package_id);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public static string[] ids_remove_id (string package_ids, string package_id);
-		public static void ids_test (void* user_data);
-		public static string ids_to_string (string package_ids);
-		public bool parse (string data) throws GLib.Error;
-		public void print ();
-		public bool set_id (string package_id) throws GLib.Error;
-		public void set_info (Pk.Info info);
-		public void set_summary (string summary);
-		public static void test (void* user_data);
-		[NoAccessorMethod]
-		public string description { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.Group group { get; set; }
-		public Pk.Info info { get; set; }
-		[NoAccessorMethod]
-		public string license { owned get; set; }
-		[NoAccessorMethod]
-		public string package_id { owned get; }
-		[NoAccessorMethod]
-		public uint64 size { get; set; }
-		public string summary { get; set; }
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] update_bugzilla_urls { owned get; set; }
-		[NoAccessorMethod]
-		public string update_changelog { owned get; set; }
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] update_cve_urls { owned get; set; }
-		[NoAccessorMethod]
-		public string update_issued { owned get; set; }
-		[NoAccessorMethod]
-		public string update_obsoletes { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.Restart update_restart { get; set; }
-		[NoAccessorMethod]
-		public Pk.UpdateState update_state { get; set; }
-		[NoAccessorMethod]
-		public string update_text { owned get; set; }
-		[NoAccessorMethod]
-		public string update_updated { owned get; set; }
-		[NoAccessorMethod]
-		public string update_updates { owned get; set; }
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] update_vendor_urls { owned get; set; }
-		[NoAccessorMethod]
-		public string url { owned get; set; }
-		public virtual signal void changed ();
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_package_sack_get_type ()")]
-	public class PackageSack : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public PackageSack ();
-		public bool add_package (Pk.Package package);
-		public bool add_package_by_id (string package_id) throws GLib.Error;
-		public bool add_packages_from_file (GLib.File file) throws GLib.Error;
-		[NoWrapper]
-		public virtual void changed ();
-		public void clear ();
-		public Pk.PackageSack filter (Pk.PackageSackFilterFunc filter_cb);
-		public Pk.PackageSack filter_by_info (Pk.Info info);
-		public Pk.Package find_by_id (string package_id);
-		public Pk.Package find_by_id_name_arch (string package_id);
-		public GLib.GenericArray<weak Pk.Package> get_array ();
-		public bool get_details (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		[CCode (finish_name = "pk_package_sack_merge_generic_finish")]
-		public async bool get_details_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (array_length = false, array_null_terminated = true)]
-		public string[] get_ids ();
-		public uint get_size ();
-		public uint64 get_total_bytes ();
-		public bool get_update_detail (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		[CCode (finish_name = "pk_package_sack_merge_generic_finish")]
-		public async bool get_update_detail_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public bool remove_by_filter (Pk.PackageSackFilterFunc filter_cb);
-		public bool remove_package (Pk.Package package);
-		public bool remove_package_by_id (string package_id);
-		public bool resolve (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		[CCode (finish_name = "pk_package_sack_merge_generic_finish")]
-		public async bool resolve_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public void sort (Pk.PackageSackSortType type);
-		public static void test (void* user_data);
-		public bool to_file (GLib.File file) throws GLib.Error;
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	[Compact]
-	public class PackageSackResults {
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_progress_get_type ()")]
-	public class Progress : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Progress ();
-		public bool set_allow_cancel (bool allow_cancel);
-		public bool set_caller_active (bool caller_active);
-		public bool set_download_size_remaining (uint64 download_size_remaining);
-		public bool set_elapsed_time (uint elapsed_time);
-		public bool set_item_progress (Pk.ItemProgress item_progress);
-		public bool set_package (Pk.Package package);
-		public bool set_package_id (string package_id);
-		public bool set_percentage (int percentage);
-		public bool set_remaining_time (uint remaining_time);
-		public bool set_role (Pk.Role role);
-		public bool set_speed (uint speed);
-		public bool set_status (Pk.Status status);
-		public bool set_transaction_flags (uint64 transaction_flags);
-		public bool set_transaction_id (string package_id);
-		public bool set_uid (uint uid);
-		public static void test (void* user_data);
-		[NoAccessorMethod]
-		public bool allow_cancel { get; set; }
-		[NoAccessorMethod]
-		public bool caller_active { get; set; }
-		[NoAccessorMethod]
-		public uint download_size_remaining { get; set; }
-		[NoAccessorMethod]
-		public uint elapsed_time { get; set; }
-		[NoAccessorMethod]
-		public Pk.ItemProgress item_progress { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.Package package { owned get; set; }
-		[NoAccessorMethod]
-		public string package_id { owned get; set; }
-		[NoAccessorMethod]
-		public int percentage { get; set; }
-		[NoAccessorMethod]
-		public uint remaining_time { get; set; }
-		[NoAccessorMethod]
-		public uint role { get; set; }
-		[NoAccessorMethod]
-		public uint speed { get; set; }
-		[NoAccessorMethod]
-		public uint status { get; set; }
-		[NoAccessorMethod]
-		public uint64 transaction_flags { get; set; }
-		[NoAccessorMethod]
-		public string transaction_id { owned get; set; }
-		[NoAccessorMethod]
-		public uint uid { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_repo_detail_get_type ()")]
-	public class RepoDetail : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public RepoDetail ();
-		public unowned string get_description ();
-		public bool get_enabled ();
-		public unowned string get_id ();
-		[NoAccessorMethod]
-		public string description { owned get; set; }
-		[NoAccessorMethod]
-		public bool enabled { get; set; }
-		[NoAccessorMethod]
-		public string repo_id { owned get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_repo_signature_required_get_type ()")]
-	public class RepoSignatureRequired : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public RepoSignatureRequired ();
-		[NoAccessorMethod]
-		public string key_fingerprint { owned get; set; }
-		[NoAccessorMethod]
-		public string key_id { owned get; set; }
-		[NoAccessorMethod]
-		public string key_timestamp { owned get; set; }
-		[NoAccessorMethod]
-		public string key_url { owned get; set; }
-		[NoAccessorMethod]
-		public string key_userid { owned get; set; }
-		[NoAccessorMethod]
-		public string package_id { owned get; set; }
-		[NoAccessorMethod]
-		public string repository_name { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.SigType type { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_require_restart_get_type ()")]
-	public class RequireRestart : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public RequireRestart ();
-		[NoAccessorMethod]
-		public string package_id { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.Restart restart { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_results_get_type ()")]
-	public class Results : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Results ();
-		public bool add_category (Pk.Category item);
-		public bool add_details (Pk.Details item);
-		public bool add_distro_upgrade (Pk.DistroUpgrade item);
-		public bool add_eula_required (Pk.EulaRequired item);
-		public bool add_files (Pk.Files item);
-		public bool add_media_change_required (Pk.MediaChangeRequired item);
-		public bool add_package (Pk.Package item);
-		public bool add_repo_detail (Pk.RepoDetail item);
-		public bool add_repo_signature_required (Pk.RepoSignatureRequired item);
-		public bool add_require_restart (Pk.RequireRestart item);
-		public bool add_transaction (Pk.TransactionPast item);
-		public bool add_update_detail (Pk.UpdateDetail item);
-		public GLib.GenericArray<weak Pk.Category> get_category_array ();
-		public GLib.GenericArray<weak Pk.Details> get_details_array ();
-		public GLib.GenericArray<weak Pk.DistroUpgrade> get_distro_upgrade_array ();
-		public Pk.Error get_error_code ();
-		public GLib.GenericArray<weak Pk.EulaRequired> get_eula_required_array ();
-		public Pk.Exit get_exit_code ();
-		public GLib.GenericArray<weak Pk.Files> get_files_array ();
-		public GLib.GenericArray<weak Pk.MediaChangeRequired> get_media_change_required_array ();
-		public GLib.GenericArray<weak Pk.Package> get_package_array ();
-		public Pk.PackageSack get_package_sack ();
-		public GLib.GenericArray<weak Pk.RepoDetail> get_repo_detail_array ();
-		public GLib.GenericArray<weak Pk.RepoSignatureRequired> get_repo_signature_required_array ();
-		public GLib.GenericArray<weak Pk.RequireRestart> get_require_restart_array ();
-		public Pk.Restart get_require_restart_worst ();
-		public Pk.Role get_role ();
-		public GLib.GenericArray<weak Pk.TransactionPast> get_transaction_array ();
-		public Pk.Bitfield get_transaction_flags ();
-		public GLib.GenericArray<weak Pk.UpdateDetail> get_update_detail_array ();
-		public bool set_error_code (Pk.Error item);
-		public bool set_exit_code (Pk.Exit exit_enum);
-		public static void test (void* user_data);
-		[NoAccessorMethod]
-		public uint inputs { get; set; }
-		[NoAccessorMethod]
-		public Pk.Progress progress { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.Role role { get; set; }
-		[NoAccessorMethod]
-		public uint64 transaction_flags { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_source_get_type ()")]
-	public class Source : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Source ();
-		[NoAccessorMethod]
-		public Pk.Role role { get; set; }
-		[NoAccessorMethod]
-		public string transaction_id { owned get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_task_get_type ()")]
-	public class Task : Pk.Client {
-		[CCode (has_construct_function = false)]
-		public Task ();
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results depends_on_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results depends_on_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results download_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, string directory, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results download_packages_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, string directory, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[NoWrapper]
-		public virtual void eula_question (uint request, Pk.Results results);
-		public bool get_allow_downgrade ();
-		public bool get_allow_reinstall ();
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results get_categories_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_categories_sync (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results get_details_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_details_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results get_files_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_files_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public bool get_interactive ();
-		public bool get_only_download ();
-		public bool get_only_trusted ();
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results get_packages_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_packages_sync (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results get_repo_list_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_repo_list_sync (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public bool get_simulate ();
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results get_update_detail_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_update_detail_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results get_updates_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results get_updates_sync (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results install_files_async ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results install_files_sync ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results install_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results install_packages_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[NoWrapper]
-		public virtual void key_question (uint request, Pk.Results results);
-		[NoWrapper]
-		public virtual void media_change_question (uint request, Pk.Results results);
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results refresh_cache_async (bool force, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results refresh_cache_sync (bool force, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results remove_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool allow_deps, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results remove_packages_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool allow_deps, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[NoWrapper]
-		public virtual void repair_question (uint request, Pk.Results results);
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results repair_system_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results repair_system_sync (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results repo_enable_async (string repo_id, bool enabled, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results repo_enable_sync (string repo_id, bool enabled, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results required_by_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results required_by_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results resolve_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] packages, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results resolve_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] packages, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results search_details_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results search_details_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results search_files_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results search_files_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results search_groups_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results search_groups_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results search_names_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results search_names_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public void set_allow_downgrade (bool allow_downgrade);
-		public void set_allow_reinstall (bool allow_reinstall);
-		public void set_interactive (bool interactive);
-		public void set_only_download (bool only_download);
-		public void set_only_trusted (bool only_trusted);
-		public void set_simulate (bool simulate);
-		[NoWrapper]
-		public virtual void simulate_question (uint request, Pk.Results results);
-		public static void test (void* user_data);
-		[NoWrapper]
-		public virtual void untrusted_question (uint request, Pk.Results results);
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results update_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results update_packages_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public bool user_accepted (uint request);
-		public bool user_declined (uint request);
-		[CCode (finish_name = "pk_task_generic_finish")]
-		public async Pk.Results what_provides_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public Pk.Results what_provides_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
-		public bool allow_downgrade { get; set; }
-		public bool allow_reinstall { get; set; }
-		public bool only_download { get; set; }
-		public bool only_trusted { get; set; }
-		public bool simulate { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_transaction_list_get_type ()")]
-	public class TransactionList : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public TransactionList ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public string[] get_ids ();
-		public static void test (void* user_data);
-		public virtual signal void added (string tid);
-		public virtual signal void removed (string tid);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_transaction_past_get_type ()")]
-	public class TransactionPast : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public TransactionPast ();
-		public unowned string get_cmdline ();
-		public unowned string get_data ();
-		public GLib.DateTime get_datetime ();
-		public uint get_duration ();
-		public unowned string get_id ();
-		public Pk.Role get_role ();
-		public bool get_succeeded ();
-		public unowned string get_timespec ();
-		public int64 get_timestamp ();
-		public uint get_uid ();
-		[NoAccessorMethod]
-		public string cmdline { owned get; set; }
-		[NoAccessorMethod]
-		public string data { owned get; set; }
-		[NoAccessorMethod]
-		public uint duration { get; set; }
-		[NoAccessorMethod]
-		public Pk.Role role { get; set; }
-		[NoAccessorMethod]
-		public bool succeeded { get; set; }
-		[NoAccessorMethod]
-		public string tid { owned get; set; }
-		[NoAccessorMethod]
-		public string timespec { owned get; set; }
-		[NoAccessorMethod]
-		public uint uid { get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_update_detail_get_type ()")]
-	public class UpdateDetail : Pk.Source {
-		[CCode (has_construct_function = false)]
-		public UpdateDetail ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_bugzilla_urls ();
-		public unowned string get_changelog ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_cve_urls ();
-		public unowned string get_issued ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_obsoletes ();
-		public unowned string get_package_id ();
-		public Pk.Restart get_restart ();
-		public Pk.UpdateState get_state ();
-		public unowned string get_update_text ();
-		public unowned string get_updated ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_updates ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_vendor_urls ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] bugzilla_urls { owned get; set; }
-		[NoAccessorMethod]
-		public string changelog { owned get; set; }
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] cve_urls { owned get; set; }
-		[NoAccessorMethod]
-		public string issued { owned get; set; }
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] obsoletes { owned get; set; }
-		[NoAccessorMethod]
-		public string package_id { owned get; set; }
-		[NoAccessorMethod]
-		public Pk.Restart restart { get; set; }
-		[NoAccessorMethod]
-		public Pk.UpdateState state { get; set; }
-		[NoAccessorMethod]
-		public string update_text { owned get; set; }
-		[NoAccessorMethod]
-		public string updated { owned get; set; }
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] updates { owned get; set; }
-		[CCode (array_length = false, array_null_terminated = true)]
-		[NoAccessorMethod]
-		public string[] vendor_urls { owned get; set; }
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	[SimpleType]
-	public struct Bitfield : uint64 {
-		public static void test (void* user_data);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", has_type_id = false)]
-	public struct EnumMatch {
-		public uint value;
-		public weak global::string string;
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkAuthorizeEnum", cprefix = "PK_AUTHORIZE_ENUM_", type_id = "pk_authorize_enum_get_type ()")]
-	[GIR (name = "AuthorizeEnum")]
-	public enum Authorize {
-		UNKNOWN,
-		YES,
-		NO,
-		INTERACTIVE,
-		LAST;
-		public static Pk.Authorize type_enum_from_string (string authorize_type);
-		public static unowned string type_enum_to_string (Pk.Authorize authorize_type);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_DISTRO_UPGRADE_ENUM_", type_id = "pk_distro_upgrade_enum_get_type ()")]
-	public enum DistroUpgradeEnum {
-		UNKNOWN,
-		STABLE,
-		UNSTABLE,
-		LAST;
-		public static Pk.DistroUpgradeEnum from_string (string upgrade);
-		public static unowned string to_string (Pk.DistroUpgradeEnum upgrade);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_ERROR_ENUM_", type_id = "pk_error_enum_get_type ()")]
-	public enum ErrorEnum {
-		UNKNOWN,
-		OOM,
-		NO_NETWORK,
-		NOT_SUPPORTED,
-		INTERNAL_ERROR,
-		GPG_FAILURE,
-		PACKAGE_ID_INVALID,
-		PACKAGE_NOT_INSTALLED,
-		PACKAGE_NOT_FOUND,
-		PACKAGE_ALREADY_INSTALLED,
-		PACKAGE_DOWNLOAD_FAILED,
-		GROUP_NOT_FOUND,
-		GROUP_LIST_INVALID,
-		DEP_RESOLUTION_FAILED,
-		FILTER_INVALID,
-		CREATE_THREAD_FAILED,
-		TRANSACTION_ERROR,
-		TRANSACTION_CANCELLED,
-		NO_CACHE,
-		REPO_NOT_FOUND,
-		CANNOT_REMOVE_SYSTEM_PACKAGE,
-		PROCESS_KILL,
-		FAILED_INITIALIZATION,
-		FAILED_FINALISE,
-		FAILED_CONFIG_PARSING,
-		CANNOT_CANCEL,
-		CANNOT_GET_LOCK,
-		NO_PACKAGES_TO_UPDATE,
-		CANNOT_WRITE_REPO_CONFIG,
-		LOCAL_INSTALL_FAILED,
-		BAD_GPG_SIGNATURE,
-		MISSING_GPG_SIGNATURE,
-		CANNOT_INSTALL_SOURCE_PACKAGE,
-		REPO_CONFIGURATION_ERROR,
-		NO_LICENSE_AGREEMENT,
-		FILE_CONFLICTS,
-		PACKAGE_CONFLICTS,
-		REPO_NOT_AVAILABLE,
-		INVALID_PACKAGE_FILE,
-		PACKAGE_INSTALL_BLOCKED,
-		PACKAGE_CORRUPT,
-		ALL_PACKAGES_ALREADY_INSTALLED,
-		FILE_NOT_FOUND,
-		NO_MORE_MIRRORS_TO_TRY,
-		NO_DISTRO_UPGRADE_DATA,
-		INCOMPATIBLE_ARCHITECTURE,
-		NO_SPACE_ON_DEVICE,
-		MEDIA_CHANGE_REQUIRED,
-		NOT_AUTHORIZED,
-		UPDATE_NOT_FOUND,
-		CANNOT_INSTALL_REPO_UNSIGNED,
-		CANNOT_UPDATE_REPO_UNSIGNED,
-		CANNOT_GET_FILELIST,
-		CANNOT_GET_REQUIRES,
-		CANNOT_DISABLE_REPOSITORY,
-		RESTRICTED_DOWNLOAD,
-		PACKAGE_FAILED_TO_CONFIGURE,
-		PACKAGE_FAILED_TO_BUILD,
-		PACKAGE_FAILED_TO_INSTALL,
-		PACKAGE_FAILED_TO_REMOVE,
-		UPDATE_FAILED_DUE_TO_RUNNING_PROCESS,
-		PACKAGE_DATABASE_CHANGED,
-		PROVIDE_TYPE_NOT_SUPPORTED,
-		INSTALL_ROOT_INVALID,
-		CANNOT_FETCH_SOURCES,
-		CANCELLED_PRIORITY,
-		UNFINISHED_TRANSACTION,
-		LOCK_REQUIRED,
-		LAST;
-		public static Pk.ErrorEnum from_string (string code);
-		public static unowned string to_string (Pk.ErrorEnum code);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkExitEnum", cprefix = "PK_EXIT_ENUM_", type_id = "pk_exit_enum_get_type ()")]
-	[GIR (name = "ExitEnum")]
-	public enum Exit {
-		UNKNOWN,
-		SUCCESS,
-		FAILED,
-		CANCELLED,
-		KEY_REQUIRED,
-		EULA_REQUIRED,
-		KILLED,
-		MEDIA_CHANGE_REQUIRED,
-		NEED_UNTRUSTED,
-		CANCELLED_PRIORITY,
-		SKIP_TRANSACTION,
-		REPAIR_REQUIRED,
-		LAST;
-		public static Pk.Exit enum_from_string (string exit);
-		public static unowned string enum_to_string (Pk.Exit exit);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkFilterEnum", cprefix = "PK_FILTER_ENUM_", type_id = "pk_filter_enum_get_type ()")]
-	[GIR (name = "FilterEnum")]
-	public enum Filter {
-		UNKNOWN,
-		NONE,
-		INSTALLED,
-		NOT_INSTALLED,
-		DEVELOPMENT,
-		NOT_DEVELOPMENT,
-		GUI,
-		NOT_GUI,
-		FREE,
-		NOT_FREE,
-		VISIBLE,
-		NOT_VISIBLE,
-		SUPPORTED,
-		NOT_SUPPORTED,
-		BASENAME,
-		NOT_BASENAME,
-		NEWEST,
-		NOT_NEWEST,
-		ARCH,
-		NOT_ARCH,
-		SOURCE,
-		NOT_SOURCE,
-		COLLECTIONS,
-		NOT_COLLECTIONS,
-		APPLICATION,
-		NOT_APPLICATION,
-		DOWNLOADED,
-		NOT_DOWNLOADED,
-		LAST;
-		public static Pk.Bitfield bitfield_from_string (string filters);
-		public static string bitfield_to_string (Pk.Bitfield filters);
-		public static Pk.Filter enum_from_string (string filter);
-		public static unowned string enum_to_string (Pk.Filter filter);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkGroupEnum", cprefix = "PK_GROUP_ENUM_", type_id = "pk_group_enum_get_type ()")]
-	[GIR (name = "GroupEnum")]
-	public enum Group {
-		UNKNOWN,
-		ACCESSIBILITY,
-		ACCESSORIES,
-		ADMIN_TOOLS,
-		COMMUNICATION,
-		DESKTOP_GNOME,
-		DESKTOP_KDE,
-		DESKTOP_OTHER,
-		DESKTOP_XFCE,
-		EDUCATION,
-		FONTS,
-		GAMES,
-		GRAPHICS,
-		INTERNET,
-		LEGACY,
-		LOCALIZATION,
-		MAPS,
-		MULTIMEDIA,
-		NETWORK,
-		OFFICE,
-		OTHER,
-		POWER_MANAGEMENT,
-		PROGRAMMING,
-		PUBLISHING,
-		REPOS,
-		SECURITY,
-		SERVERS,
-		SYSTEM,
-		VIRTUALIZATION,
-		SCIENCE,
-		DOCUMENTATION,
-		ELECTRONICS,
-		COLLECTIONS,
-		VENDOR,
-		NEWEST,
-		LAST;
-		public static Pk.Bitfield bitfield_from_string (string groups);
-		public static string bitfield_to_string (Pk.Bitfield groups);
-		public static Pk.Group enum_from_string (string group);
-		public static unowned string enum_to_string (Pk.Group group);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkInfoEnum", cprefix = "PK_INFO_ENUM_", type_id = "pk_info_enum_get_type ()")]
-	[GIR (name = "InfoEnum")]
-	public enum Info {
-		UNKNOWN,
-		INSTALLED,
-		AVAILABLE,
-		LOW,
-		ENHANCEMENT,
-		NORMAL,
-		BUGFIX,
-		IMPORTANT,
-		SECURITY,
-		BLOCKED,
-		DOWNLOADING,
-		UPDATING,
-		INSTALLING,
-		REMOVING,
-		CLEANUP,
-		OBSOLETING,
-		COLLECTION_INSTALLED,
-		COLLECTION_AVAILABLE,
-		FINISHED,
-		REINSTALLING,
-		DOWNGRADING,
-		PREPARING,
-		DECOMPRESSING,
-		UNTRUSTED,
-		TRUSTED,
-		UNAVAILABLE,
-		LAST;
-		public static Pk.Info enum_from_string (string info);
-		public static unowned string enum_to_localised_past (Pk.Info info);
-		public static unowned string enum_to_localised_present (Pk.Info info);
-		public static unowned string enum_to_string (Pk.Info info);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkMediaTypeEnum", cprefix = "PK_MEDIA_TYPE_ENUM_", type_id = "pk_media_type_enum_get_type ()")]
-	[GIR (name = "MediaTypeEnum")]
-	public enum MediaType {
-		UNKNOWN,
-		CD,
-		DVD,
-		DISC,
-		LAST;
-		public static Pk.MediaType enum_from_string (string media_type);
-		public static unowned string enum_to_string (Pk.MediaType media_type);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkNetworkEnum", cprefix = "PK_NETWORK_ENUM_", type_id = "pk_network_enum_get_type ()")]
-	[GIR (name = "NetworkEnum")]
-	public enum Network {
-		UNKNOWN,
-		OFFLINE,
-		ONLINE,
-		WIRED,
-		WIFI,
-		MOBILE,
-		LAST;
-		public static Pk.Network enum_from_string (string network);
-		public static unowned string enum_to_string (Pk.Network network);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_OFFLINE_ACTION_", type_id = "pk_offline_action_get_type ()")]
-	public enum OfflineAction {
-		UNKNOWN,
-		REBOOT,
-		POWER_OFF,
-		UNSET,
-		LAST;
-		public static Pk.OfflineAction from_string (string action);
-		public static unowned string to_string (Pk.OfflineAction action);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_PACKAGE_SACK_SORT_TYPE_", type_id = "pk_package_sack_sort_type_get_type ()")]
-	public enum PackageSackSortType {
-		NAME,
-		INFO,
-		PACKAGE_ID,
-		SUMMARY,
-		LAST
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_PROGRESS_TYPE_", type_id = "pk_progress_type_get_type ()")]
-	public enum ProgressType {
-		PACKAGE_ID,
-		TRANSACTION_ID,
-		PERCENTAGE,
-		ALLOW_CANCEL,
-		STATUS,
-		ROLE,
-		CALLER_ACTIVE,
-		ELAPSED_TIME,
-		REMAINING_TIME,
-		SPEED,
-		DOWNLOAD_SIZE_REMAINING,
-		UID,
-		PACKAGE,
-		ITEM_PROGRESS,
-		TRANSACTION_FLAGS,
-		INVALID
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkRestartEnum", cprefix = "PK_RESTART_ENUM_", type_id = "pk_restart_enum_get_type ()")]
-	[GIR (name = "RestartEnum")]
-	public enum Restart {
-		UNKNOWN,
-		NONE,
-		APPLICATION,
-		SESSION,
-		SYSTEM,
-		SECURITY_SESSION,
-		SECURITY_SYSTEM,
-		LAST;
-		public static Pk.Restart enum_from_string (string restart);
-		public static unowned string enum_to_string (Pk.Restart restart);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkRoleEnum", cprefix = "PK_ROLE_ENUM_", type_id = "pk_role_enum_get_type ()")]
-	[GIR (name = "RoleEnum")]
-	public enum Role {
-		UNKNOWN,
-		CANCEL,
-		DEPENDS_ON,
-		GET_DETAILS,
-		GET_FILES,
-		GET_PACKAGES,
-		GET_REPO_LIST,
-		REQUIRED_BY,
-		GET_UPDATE_DETAIL,
-		GET_UPDATES,
-		INSTALL_FILES,
-		INSTALL_PACKAGES,
-		INSTALL_SIGNATURE,
-		REFRESH_CACHE,
-		REMOVE_PACKAGES,
-		REPO_ENABLE,
-		REPO_SET_DATA,
-		RESOLVE,
-		SEARCH_DETAILS,
-		SEARCH_FILE,
-		SEARCH_GROUP,
-		SEARCH_NAME,
-		UPDATE_PACKAGES,
-		WHAT_PROVIDES,
-		ACCEPT_EULA,
-		DOWNLOAD_PACKAGES,
-		GET_DISTRO_UPGRADES,
-		GET_CATEGORIES,
-		GET_OLD_TRANSACTIONS,
-		REPAIR_SYSTEM,
-		GET_DETAILS_LOCAL,
-		GET_FILES_LOCAL,
-		REPO_REMOVE,
-		LAST;
-		public static Pk.Bitfield bitfield_from_string (string roles);
-		public static string bitfield_to_string (Pk.Bitfield roles);
-		public static Pk.Role enum_from_string (string role);
-		public static unowned string enum_to_localised_present (Pk.Role role);
-		public static unowned string enum_to_string (Pk.Role role);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkSigTypeEnum", cprefix = "PK_SIGTYPE_ENUM_", type_id = "pk_sig_type_enum_get_type ()")]
-	[GIR (name = "SigTypeEnum")]
-	public enum SigType {
-		UNKNOWN,
-		GPG,
-		LAST;
-		public static Pk.SigType enum_from_string (string sig_type);
-		public static unowned string enum_to_string (Pk.SigType sig_type);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkStatusEnum", cprefix = "PK_STATUS_ENUM_", type_id = "pk_status_enum_get_type ()")]
-	[GIR (name = "StatusEnum")]
-	public enum Status {
-		UNKNOWN,
-		WAIT,
-		SETUP,
-		RUNNING,
-		QUERY,
-		INFO,
-		REMOVE,
-		REFRESH_CACHE,
-		DOWNLOAD,
-		INSTALL,
-		UPDATE,
-		CLEANUP,
-		OBSOLETE,
-		DEP_RESOLVE,
-		SIG_CHECK,
-		TEST_COMMIT,
-		COMMIT,
-		REQUEST,
-		FINISHED,
-		CANCEL,
-		DOWNLOAD_REPOSITORY,
-		DOWNLOAD_PACKAGELIST,
-		DOWNLOAD_FILELIST,
-		DOWNLOAD_CHANGELOG,
-		DOWNLOAD_GROUP,
-		DOWNLOAD_UPDATEINFO,
-		REPACKAGING,
-		LOADING_CACHE,
-		SCAN_APPLICATIONS,
-		GENERATE_PACKAGE_LIST,
-		WAITING_FOR_LOCK,
-		WAITING_FOR_AUTH,
-		SCAN_PROCESS_LIST,
-		CHECK_EXECUTABLE_FILES,
-		CHECK_LIBRARIES,
-		COPY_FILES,
-		LAST;
-		public static Pk.Status enum_from_string (string status);
-		public static unowned string enum_to_localised_text (Pk.Status status);
-		public static unowned string enum_to_string (Pk.Status status);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkTransactionFlagEnum", cprefix = "PK_TRANSACTION_FLAG_ENUM_", type_id = "pk_transaction_flag_enum_get_type ()")]
-	[GIR (name = "TransactionFlagEnum")]
-	public enum TransactionFlag {
-		NONE,
-		ONLY_TRUSTED,
-		SIMULATE,
-		ONLY_DOWNLOAD,
-		ALLOW_REINSTALL,
-		JUST_REINSTALL,
-		ALLOW_DOWNGRADE,
-		LAST;
-		public static Pk.Bitfield bitfield_from_string (string transaction_flags);
-		public static string bitfield_to_string (Pk.Bitfield transaction_flags);
-		public static Pk.TransactionFlag enum_from_string (string transaction_flag);
-		public static unowned string enum_to_string (Pk.TransactionFlag transaction_flag);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkUpdateStateEnum", cprefix = "PK_UPDATE_STATE_ENUM_", type_id = "pk_update_state_enum_get_type ()")]
-	[GIR (name = "UpdateStateEnum")]
-	public enum UpdateState {
-		UNKNOWN,
-		STABLE,
-		UNSTABLE,
-		TESTING,
-		LAST;
-		public static Pk.UpdateState enum_from_string (string update_state);
-		public static unowned string enum_to_string (Pk.UpdateState update_state);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkUpgradeKindEnum", cprefix = "PK_UPGRADE_KIND_ENUM_", type_id = "pk_upgrade_kind_enum_get_type ()")]
-	[GIR (name = "UpgradeKindEnum")]
-	public enum UpgradeKind {
-		UNKNOWN,
-		MINIMAL,
-		DEFAULT,
-		COMPLETE,
-		LAST;
-		public static Pk.UpgradeKind enum_from_string (string upgrade_kind);
-		public static unowned string enum_to_string (Pk.UpgradeKind upgrade_kind);
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_CLIENT_ERROR_")]
-	public errordomain ClientError {
-		FAILED,
-		FAILED_AUTH,
-		NO_TID,
-		ALREADY_TID,
-		ROLE_UNKNOWN,
-		CANNOT_START_DAEMON,
-		INVALID_INPUT,
-		INVALID_FILE,
-		NOT_SUPPORTED,
-		DECLINED_SIMULATION,
-		LAST;
-		public static GLib.Quark quark ();
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_CONTROL_ERROR_")]
-	public errordomain ControlError {
-		FAILED,
-		CANNOT_START_DAEMON;
-		public static GLib.Quark quark ();
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_OFFLINE_ERROR_")]
-	public errordomain OfflineError {
-		FAILED,
-		INVALID_VALUE,
-		NO_DATA,
-		LAST;
-		public static GLib.Quark quark ();
-	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", instance_pos = 1.9)]
-	public delegate bool PackageSackFilterFunc (Pk.Package package);
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", instance_pos = 2.9)]
-	public delegate void ProgressCallback (Pk.Progress progress, Pk.ProgressType type);
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_INTERFACE")]
-	public const string DBUS_INTERFACE;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_INTERFACE_OFFLINE")]
-	public const string DBUS_INTERFACE_OFFLINE;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_INTERFACE_TRANSACTION")]
-	public const string DBUS_INTERFACE_TRANSACTION;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_PATH")]
-	public const string DBUS_PATH;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_SERVICE")]
-	public const string DBUS_SERVICE;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DESKTOP_DEFAULT_APPLICATION_DIR")]
-	public const string DESKTOP_DEFAULT_APPLICATION_DIR;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_MAJOR_VERSION")]
-	public const int MAJOR_VERSION;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_MICRO_VERSION")]
-	public const int MICRO_VERSION;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_MINOR_VERSION")]
-	public const int MINOR_VERSION;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_OFFLINE_DESTDIR")]
-	public const string OFFLINE_DESTDIR;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_OFFLINE_RESULTS_GROUP")]
-	public const string OFFLINE_RESULTS_GROUP;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_IDS_DELIM")]
-	public const string PACKAGE_IDS_DELIM;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_ID_ARCH")]
-	public const int PACKAGE_ID_ARCH;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_ID_DATA")]
-	public const int PACKAGE_ID_DATA;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_ID_NAME")]
-	public const int PACKAGE_ID_NAME;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_ID_VERSION")]
-	public const int PACKAGE_ID_VERSION;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_SYSTEM_PACKAGE_CACHE_FILENAME")]
-	public const string SYSTEM_PACKAGE_CACHE_FILENAME;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_SYSTEM_PACKAGE_LIST_FILENAME")]
-	public const string SYSTEM_PACKAGE_LIST_FILENAME;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static void common_test (void* user_data);
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static void debug_add_log_domain (string log_domain);
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool debug_is_verbose ();
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static void debug_set_verbose (bool verbose);
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static unowned string enum_find_string (Pk.EnumMatch table, uint value);
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static uint enum_find_value (Pk.EnumMatch table, string string);
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static void enum_test (void* user_data);
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static string get_distro_id ();
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static string iso8601_from_date (GLib.Date date);
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static string iso8601_present ();
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_auth_cancel () throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_auth_clear_results () throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_auth_invalidate () throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_auth_set_action (Pk.OfflineAction action) throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_auth_set_prepared_ids (string package_ids) throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_auth_set_results (Pk.Results results) throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_auth_trigger (Pk.OfflineAction action) throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_cancel (GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_clear_results (GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static Pk.OfflineAction offline_get_action () throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static GLib.FileMonitor offline_get_action_monitor (GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (array_length = false, array_null_terminated = true, cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static string[] offline_get_prepared_ids () throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static GLib.FileMonitor offline_get_prepared_monitor (GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static Pk.PackageSack offline_get_prepared_sack () throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static Pk.Results offline_get_results () throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static uint64 offline_get_results_mtime () throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static bool offline_trigger (Pk.OfflineAction action, GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static void polkit_agent_close ();
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static int polkit_agent_open ();
-	[CCode (array_length = false, array_null_terminated = true, cheader_filename = "packagekit-glib2/packagekit.h")]
-	public static string[] ptr_array_to_strv (GLib.GenericArray<string> array);
-}
diff --git a/src/page-view.c b/src/page-view.c
deleted file mode 100644
index 96732cc..0000000
--- a/src/page-view.c
+++ /dev/null
@@ -1,6912 +0,0 @@
-/* page-view.c generated by valac 0.34.6, the Vala compiler
- * generated from page-view.vala, do not modify */
-
-/*
- * Copyright (C) 2009-2015 Canonical Ltd.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 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.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <float.h>
-#include <math.h>
-#include <gdk/gdk.h>
-#include <string.h>
-#include <stdlib.h>
-#include <cairo.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_CROP_LOCATION (crop_location_get_type ())
-
-#define TYPE_PAGE_VIEW (page_view_get_type ())
-#define PAGE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_VIEW, PageView))
-#define PAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_VIEW, PageViewClass))
-#define IS_PAGE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_VIEW))
-#define IS_PAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_VIEW))
-#define PAGE_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_VIEW, PageViewClass))
-
-typedef struct _PageView PageView;
-typedef struct _PageViewClass PageViewClass;
-typedef struct _PageViewPrivate PageViewPrivate;
-
-#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 TYPE_SCAN_DIRECTION (scan_direction_get_type ())
-#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 _g_free0(var) (var = (g_free (var), NULL))
-typedef struct _ParamSpecPageView ParamSpecPageView;
-
-typedef enum  {
-	CROP_LOCATION_NONE = 0,
-	CROP_LOCATION_MIDDLE,
-	CROP_LOCATION_TOP,
-	CROP_LOCATION_BOTTOM,
-	CROP_LOCATION_LEFT,
-	CROP_LOCATION_RIGHT,
-	CROP_LOCATION_TOP_LEFT,
-	CROP_LOCATION_TOP_RIGHT,
-	CROP_LOCATION_BOTTOM_LEFT,
-	CROP_LOCATION_BOTTOM_RIGHT
-} CropLocation;
-
-struct _PageView {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PageViewPrivate * priv;
-};
-
-struct _PageViewClass {
-	GTypeClass parent_class;
-	void (*finalize) (PageView *self);
-};
-
-typedef enum  {
-	SCAN_DIRECTION_TOP_TO_BOTTOM,
-	SCAN_DIRECTION_LEFT_TO_RIGHT,
-	SCAN_DIRECTION_BOTTOM_TO_TOP,
-	SCAN_DIRECTION_RIGHT_TO_LEFT
-} ScanDirection;
-
-struct _PageViewPrivate {
-	Page* _page;
-	GdkPixbuf* image;
-	gboolean selected_;
-	gint border_width;
-	gboolean update_image;
-	ScanDirection scan_direction;
-	gint scan_line;
-	gint width_;
-	gint height_;
-	gint _x_offset;
-	gint _y_offset;
-	CropLocation crop_location;
-	gdouble selected_crop_px;
-	gdouble selected_crop_py;
-	gint selected_crop_x;
-	gint selected_crop_y;
-	gint selected_crop_w;
-	gint selected_crop_h;
-	GdkCursorType _cursor;
-	gint animate_n_segments;
-	gint animate_segment;
-	guint animate_timeout;
-};
-
-struct _ParamSpecPageView {
-	GParamSpec parent_instance;
-};
-
-
-static gpointer page_view_parent_class = NULL;
-
-GType crop_location_get_type (void) G_GNUC_CONST;
-gpointer page_view_ref (gpointer instance);
-void page_view_unref (gpointer instance);
-GParamSpec* param_spec_page_view (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_page_view (GValue* value, gpointer v_object);
-void value_take_page_view (GValue* value, gpointer v_object);
-gpointer value_get_page_view (const GValue* value);
-GType page_view_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;
-GType scan_direction_get_type (void) G_GNUC_CONST;
-#define PAGE_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PAGE_VIEW, PageViewPrivate))
-enum  {
-	PAGE_VIEW_DUMMY_PROPERTY
-};
-Page* page_view_get_page (PageView* self);
-static void page_view_page_pixels_changed_cb (PageView* self, Page* p);
-static void _page_view_page_pixels_changed_cb_page_pixels_changed (Page* _sender, gpointer self);
-static void page_view_page_size_changed_cb (PageView* self, Page* p);
-static void _page_view_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self);
-static void page_view_page_overlay_changed_cb (PageView* self, Page* p);
-static void _page_view_page_overlay_changed_cb_page_crop_changed (Page* _sender, gpointer self);
-static void _page_view_page_overlay_changed_cb_page_scan_line_changed (Page* _sender, gpointer self);
-static void page_view_scan_direction_changed_cb (PageView* self, Page* p);
-static void _page_view_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self);
-PageView* page_view_new (Page* page);
-PageView* page_view_construct (GType object_type, Page* page);
-static void page_view_set_page (PageView* self, Page* value);
-static guchar page_view_get_sample (PageView* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint sample);
-static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guchar* pixel, int pixel_length1);
-ScanDirection page_get_scan_direction (Page* self);
-gint page_get_scan_width (Page* self);
-gint page_get_scan_height (Page* self);
-gint page_get_depth (Page* self);
-gint page_get_n_channels (Page* self);
-guchar* page_get_pixels (Page* self, int* result_length1);
-gint page_get_rowstride (Page* self);
-static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble r, gdouble t, gdouble b, guchar* output, int output_length1, gint offset);
-static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** output_image, gint output_width, gint output_height, ScanDirection scan_direction, gint old_scan_line, gint scan_line);
-gint page_get_width (Page* self);
-gint page_get_height (Page* self);
-gboolean page_get_has_data (Page* self);
-static gint page_view_get_preview_width (PageView* self);
-static gint page_view_get_preview_height (PageView* self);
-static void page_view_update_page_view (PageView* self);
-gint page_get_scan_line (Page* self);
-static gint page_view_page_to_screen_x (PageView* self, gint x);
-static gint page_view_page_to_screen_y (PageView* self, gint y);
-static gint page_view_screen_to_page_x (PageView* self, gint x);
-static gint page_view_screen_to_page_y (PageView* self, gint y);
-static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y);
-gboolean page_get_has_crop (Page* self);
-gint page_get_crop_x (Page* self);
-gint page_get_crop_y (Page* self);
-gint page_get_crop_width (Page* self);
-gint page_get_crop_height (Page* self);
-const gchar* page_get_crop_name (Page* self);
-void page_view_button_press (PageView* self, gint x, gint y);
-void page_view_motion (PageView* self, gint x, gint y);
-static void page_view_set_cursor (PageView* self, GdkCursorType value);
-void page_move_crop (Page* self, gint x, gint y);
-void page_set_custom_crop (Page* self, gint width, gint height);
-void page_view_button_release (PageView* self, gint x, gint y);
-static gboolean page_view_animation_cb (PageView* self);
-static void page_view_update_animation (PageView* self);
-gboolean page_get_is_scanning (Page* self);
-static gboolean _page_view_animation_cb_gsource_func (gpointer self);
-void page_view_render (PageView* self, cairo_t* context);
-gint page_view_get_x_offset (PageView* self);
-gint page_view_get_y_offset (PageView* self);
-gboolean page_view_get_selected (PageView* self);
-void page_view_set_selected (PageView* self, gboolean value);
-void page_view_set_x_offset (PageView* self, gint value);
-void page_view_set_y_offset (PageView* self, gint value);
-GdkCursorType page_view_get_cursor (PageView* self);
-gint page_view_get_width (PageView* self);
-void page_view_set_width (PageView* self, gint value);
-gint page_view_get_height (PageView* self);
-void page_view_set_height (PageView* self, gint value);
-static void page_view_finalize (PageView* obj);
-
-
-GType crop_location_get_type (void) {
-	static volatile gsize crop_location_type_id__volatile = 0;
-	if (g_once_init_enter (&crop_location_type_id__volatile)) {
-		static const GEnumValue values[] = {{CROP_LOCATION_NONE, "CROP_LOCATION_NONE", "none"}, {CROP_LOCATION_MIDDLE, "CROP_LOCATION_MIDDLE", "middle"}, {CROP_LOCATION_TOP, "CROP_LOCATION_TOP", "top"}, {CROP_LOCATION_BOTTOM, "CROP_LOCATION_BOTTOM", "bottom"}, {CROP_LOCATION_LEFT, "CROP_LOCATION_LEFT", "left"}, {CROP_LOCATION_RIGHT, "CROP_LOCATION_RIGHT", "right"}, {CROP_LOCATION_TOP_LEFT, "CROP_LOCATION_TOP_LEFT", "top-left"}, {CROP_LOCATION_TOP_RIGHT, "CROP_LOCATION_TOP_RIGHT", "top-right"}, {CROP_LOCATION_BOTTOM_LEFT, "CROP_LOCATION_BOTTOM_LEFT", "bottom-left"}, {CROP_LOCATION_BOTTOM_RIGHT, "CROP_LOCATION_BOTTOM_RIGHT", "bottom-right"}, {0, NULL, NULL}};
-		GType crop_location_type_id;
-		crop_location_type_id = g_enum_register_static ("CropLocation", values);
-		g_once_init_leave (&crop_location_type_id__volatile, crop_location_type_id);
-	}
-	return crop_location_type_id__volatile;
-}
-
-
-static void _page_view_page_pixels_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_page_pixels_changed_cb ((PageView*) self, _sender);
-#line 222 "page-view.c"
-}
-
-
-static void _page_view_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_page_size_changed_cb ((PageView*) self, _sender);
-#line 229 "page-view.c"
-}
-
-
-static void _page_view_page_overlay_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_page_overlay_changed_cb ((PageView*) self, _sender);
-#line 236 "page-view.c"
-}
-
-
-static void _page_view_page_overlay_changed_cb_page_scan_line_changed (Page* _sender, gpointer self) {
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_page_overlay_changed_cb ((PageView*) self, _sender);
-#line 243 "page-view.c"
-}
-
-
-static void _page_view_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_scan_direction_changed_cb ((PageView*) self, _sender);
-#line 250 "page-view.c"
-}
-
-
-PageView* page_view_construct (GType object_type, Page* page) {
-	PageView* self = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (page != NULL, NULL);
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self = (PageView*) g_type_create_instance (object_type);
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = page;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_set_page (self, _tmp0_);
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = page;
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp1_, "pixels-changed", (GCallback) _page_view_page_pixels_changed_cb_page_pixels_changed, self);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp2_, "size-changed", (GCallback) _page_view_page_size_changed_cb_page_size_changed, self);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = page;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp3_, "crop-changed", (GCallback) _page_view_page_overlay_changed_cb_page_crop_changed, self);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = page;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp4_, "scan-line-changed", (GCallback) _page_view_page_overlay_changed_cb_page_scan_line_changed, self);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = page;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp5_, "scan-direction-changed", (GCallback) _page_view_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return self;
-#line 292 "page-view.c"
-}
-
-
-PageView* page_view_new (Page* page) {
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return page_view_construct (TYPE_PAGE_VIEW, page);
-#line 299 "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 104 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, '\0');
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (guchar) 0xFF;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 311 "page-view.c"
-}
-
-
-static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guchar* pixel, int pixel_length1) {
-	Page* _tmp0_ = NULL;
-	ScanDirection _tmp1_ = 0;
-	ScanDirection _tmp2_ = 0;
-	gint depth = 0;
-	Page* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	gint _tmp25_ = 0;
-	gint n_channels = 0;
-	Page* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	guchar* pixels = NULL;
-	Page* _tmp29_ = NULL;
-	gint _tmp30_ = 0;
-	guchar* _tmp31_ = NULL;
-	gint pixels_length1 = 0;
-	gint _pixels_size_ = 0;
-	gint offset = 0;
-	Page* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	gboolean _tmp36_ = FALSE;
-	gint _tmp37_ = 0;
-	guchar* _tmp105_ = NULL;
-	gint _tmp105__length1 = 0;
-	guchar* _tmp106_ = NULL;
-	gint _tmp106__length1 = 0;
-	gint _tmp107_ = 0;
-	gint _tmp108_ = 0;
-	gint _tmp109_ = 0;
-	gint _tmp110_ = 0;
-	gint _tmp111_ = 0;
-	guchar _tmp112_ = '\0';
-	guchar _tmp113_ = '\0';
-	guchar* _tmp114_ = NULL;
-	gint _tmp114__length1 = 0;
-	guchar* _tmp115_ = NULL;
-	gint _tmp115__length1 = 0;
-	gint _tmp116_ = 0;
-	gint _tmp117_ = 0;
-	gint _tmp118_ = 0;
-	gint _tmp119_ = 0;
-	gint _tmp120_ = 0;
-	guchar _tmp121_ = '\0';
-	guchar _tmp122_ = '\0';
-	guchar* _tmp123_ = NULL;
-	gint _tmp123__length1 = 0;
-	guchar* _tmp124_ = NULL;
-	gint _tmp124__length1 = 0;
-	gint _tmp125_ = 0;
-	gint _tmp126_ = 0;
-	gint _tmp127_ = 0;
-	gint _tmp128_ = 0;
-	gint _tmp129_ = 0;
-	guchar _tmp130_ = '\0';
-	guchar _tmp131_ = '\0';
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (page != NULL);
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = page;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = _tmp1_;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	switch (_tmp2_) {
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 387 "page-view.c"
-		{
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 391 "page-view.c"
-		}
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 395 "page-view.c"
-		{
-			Page* _tmp3_ = NULL;
-			gint _tmp4_ = 0;
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			Page* _tmp7_ = NULL;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
-			gint _tmp10_ = 0;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp3_ = page;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp4_ = page_get_scan_width (_tmp3_);
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp5_ = _tmp4_;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp6_ = x;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			x = (_tmp5_ - _tmp6_) - 1;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp7_ = page;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp8_ = page_get_scan_height (_tmp7_);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp9_ = _tmp8_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp10_ = y;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			y = (_tmp9_ - _tmp10_) - 1;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 427 "page-view.c"
-		}
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 431 "page-view.c"
-		{
-			gint t = 0;
-			gint _tmp11_ = 0;
-			Page* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp11_ = x;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			t = _tmp11_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp12_ = page;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp13_ = page_get_scan_width (_tmp12_);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp14_ = _tmp13_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp15_ = y;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			x = (_tmp14_ - _tmp15_) - 1;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp16_ = t;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			y = _tmp16_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 460 "page-view.c"
-		}
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 464 "page-view.c"
-		{
-			gint t = 0;
-			gint _tmp17_ = 0;
-			gint _tmp18_ = 0;
-			Page* _tmp19_ = NULL;
-			gint _tmp20_ = 0;
-			gint _tmp21_ = 0;
-			gint _tmp22_ = 0;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp17_ = x;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			t = _tmp17_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp18_ = y;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			x = _tmp18_;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp19_ = page;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp20_ = page_get_scan_height (_tmp19_);
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp21_ = _tmp20_;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp22_ = t;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			y = (_tmp21_ - _tmp22_) - 1;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 493 "page-view.c"
-		}
-		default:
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		break;
-#line 498 "page-view.c"
-	}
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp23_ = page;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp24_ = page_get_depth (_tmp23_);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp25_ = _tmp24_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	depth = _tmp25_;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp26_ = page;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp27_ = page_get_n_channels (_tmp26_);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp28_ = _tmp27_;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	n_channels = _tmp28_;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp29_ = page;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp31_ = page_get_pixels (_tmp29_, &_tmp30_);
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	pixels = _tmp31_;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	pixels_length1 = _tmp30_;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_pixels_size_ = pixels_length1;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp32_ = page;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp33_ = page_get_rowstride (_tmp32_);
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp34_ = _tmp33_;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp35_ = y;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	offset = _tmp34_ * _tmp35_;
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp37_ = depth;
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp37_ == 8) {
-#line 540 "page-view.c"
-		gint _tmp38_ = 0;
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp38_ = n_channels;
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = _tmp38_ == 3;
-#line 546 "page-view.c"
-	} else {
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = FALSE;
-#line 550 "page-view.c"
-	}
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp36_) {
-#line 554 "page-view.c"
-		gint o = 0;
-		gint _tmp39_ = 0;
-		gint _tmp40_ = 0;
-		gint _tmp41_ = 0;
-		guchar* _tmp42_ = NULL;
-		gint _tmp42__length1 = 0;
-		guchar* _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		gint _tmp44_ = 0;
-		guchar _tmp45_ = '\0';
-		guchar _tmp46_ = '\0';
-		guchar* _tmp47_ = NULL;
-		gint _tmp47__length1 = 0;
-		guchar* _tmp48_ = NULL;
-		gint _tmp48__length1 = 0;
-		gint _tmp49_ = 0;
-		guchar _tmp50_ = '\0';
-		guchar _tmp51_ = '\0';
-		guchar* _tmp52_ = NULL;
-		gint _tmp52__length1 = 0;
-		guchar* _tmp53_ = NULL;
-		gint _tmp53__length1 = 0;
-		gint _tmp54_ = 0;
-		guchar _tmp55_ = '\0';
-		guchar _tmp56_ = '\0';
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp39_ = offset;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_ = x;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = n_channels;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		o = _tmp39_ + (_tmp40_ * _tmp41_);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = pixel;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42__length1 = pixel_length1;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = pixels;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43__length1 = pixels_length1;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44_ = o;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_ = _tmp43_[_tmp44_];
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_[0] = _tmp45_;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = _tmp42_[0];
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp47_ = pixel;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp47__length1 = pixel_length1;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp48_ = pixels;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp48__length1 = pixels_length1;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp49_ = o;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp50_ = _tmp48_[_tmp49_ + 1];
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp47_[1] = _tmp50_;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp51_ = _tmp47_[1];
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp52_ = pixel;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp52__length1 = pixel_length1;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_ = pixels;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53__length1 = pixels_length1;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp54_ = o;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp55_ = _tmp53_[_tmp54_ + 2];
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp52_[2] = _tmp55_;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = _tmp52_[2];
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 638 "page-view.c"
-	} else {
-		gboolean _tmp57_ = FALSE;
-		gint _tmp58_ = 0;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp58_ = depth;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp58_ == 8) {
-#line 646 "page-view.c"
-			gint _tmp59_ = 0;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp59_ = n_channels;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp57_ = _tmp59_ == 1;
-#line 652 "page-view.c"
-		} else {
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp57_ = FALSE;
-#line 656 "page-view.c"
-		}
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp57_) {
-#line 660 "page-view.c"
-			guchar* _tmp60_ = NULL;
-			gint _tmp60__length1 = 0;
-			guchar* _tmp61_ = NULL;
-			gint _tmp61__length1 = 0;
-			guchar* _tmp62_ = NULL;
-			gint _tmp62__length1 = 0;
-			guchar* _tmp63_ = NULL;
-			gint _tmp63__length1 = 0;
-			gint _tmp64_ = 0;
-			gint _tmp65_ = 0;
-			guchar _tmp66_ = '\0';
-			guchar _tmp67_ = '\0';
-			guchar _tmp68_ = '\0';
-			guchar _tmp69_ = '\0';
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp60_ = pixel;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp60__length1 = pixel_length1;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp61_ = pixel;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp61__length1 = pixel_length1;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp62_ = pixel;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp62__length1 = pixel_length1;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp63_ = pixels;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp63__length1 = pixels_length1;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp64_ = offset;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp65_ = x;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp66_ = _tmp63_[_tmp64_ + _tmp65_];
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp62_[2] = _tmp66_;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp67_ = _tmp62_[2];
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp61_[1] = _tmp67_;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp68_ = _tmp61_[1];
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp60_[0] = _tmp68_;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp69_ = _tmp60_[0];
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			return;
-#line 711 "page-view.c"
-		} else {
-			gboolean _tmp70_ = FALSE;
-			gint _tmp71_ = 0;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp71_ = depth;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			if (_tmp71_ == 1) {
-#line 719 "page-view.c"
-				gint _tmp72_ = 0;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp72_ = n_channels;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp70_ = _tmp72_ == 1;
-#line 725 "page-view.c"
-			} else {
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp70_ = FALSE;
-#line 729 "page-view.c"
-			}
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			if (_tmp70_) {
-#line 733 "page-view.c"
-				gint o = 0;
-				gint _tmp73_ = 0;
-				gint _tmp74_ = 0;
-				gint _tmp75_ = 0;
-				guchar* _tmp76_ = NULL;
-				gint _tmp76__length1 = 0;
-				gint _tmp77_ = 0;
-				guchar _tmp78_ = '\0';
-				gint _tmp79_ = 0;
-				guchar* _tmp80_ = NULL;
-				gint _tmp80__length1 = 0;
-				guchar* _tmp81_ = NULL;
-				gint _tmp81__length1 = 0;
-				guchar* _tmp82_ = NULL;
-				gint _tmp82__length1 = 0;
-				guchar _tmp83_ = '\0';
-				guchar _tmp84_ = '\0';
-				guchar _tmp85_ = '\0';
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp73_ = offset;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp74_ = x;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				o = _tmp73_ + (_tmp74_ / 8);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp76_ = pixels;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp76__length1 = pixels_length1;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp77_ = o;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp78_ = _tmp76_[_tmp77_];
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp79_ = x;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (((gint) (_tmp78_ & (0x80 >> (_tmp79_ % 8)))) != 0) {
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp75_ = 0x00;
-#line 772 "page-view.c"
-				} else {
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp75_ = 0xFF;
-#line 776 "page-view.c"
-				}
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp80_ = pixel;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp80__length1 = pixel_length1;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp81_ = pixel;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp81__length1 = pixel_length1;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp82_ = pixel;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp82__length1 = pixel_length1;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp82_[2] = (guchar) _tmp75_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp83_ = _tmp82_[2];
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp81_[1] = _tmp83_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp84_ = _tmp81_[1];
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp80_[0] = _tmp84_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp85_ = _tmp80_[0];
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				return;
-#line 804 "page-view.c"
-			} else {
-				gboolean _tmp86_ = FALSE;
-				gint _tmp87_ = 0;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp87_ = depth;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp87_ == 2) {
-#line 812 "page-view.c"
-					gint _tmp88_ = 0;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp88_ = n_channels;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp86_ = _tmp88_ == 1;
-#line 818 "page-view.c"
-				} else {
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp86_ = FALSE;
-#line 822 "page-view.c"
-				}
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp86_) {
-#line 826 "page-view.c"
-					gint block_shift[4] = {0};
-					gint _tmp89_[4] = {0};
-					gint o = 0;
-					gint _tmp90_ = 0;
-					gint _tmp91_ = 0;
-					gint sample = 0;
-					guchar* _tmp92_ = NULL;
-					gint _tmp92__length1 = 0;
-					gint _tmp93_ = 0;
-					guchar _tmp94_ = '\0';
-					gint _tmp95_ = 0;
-					gint _tmp96_ = 0;
-					gint _tmp97_ = 0;
-					guchar* _tmp98_ = NULL;
-					gint _tmp98__length1 = 0;
-					guchar* _tmp99_ = NULL;
-					gint _tmp99__length1 = 0;
-					guchar* _tmp100_ = NULL;
-					gint _tmp100__length1 = 0;
-					gint _tmp101_ = 0;
-					guchar _tmp102_ = '\0';
-					guchar _tmp103_ = '\0';
-					guchar _tmp104_ = '\0';
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp89_[0] = 6;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp89_[1] = 4;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp89_[2] = 2;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp89_[3] = 0;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					memcpy (block_shift, _tmp89_, 4 * sizeof (gint));
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp90_ = offset;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp91_ = x;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					o = _tmp90_ + (_tmp91_ / 4);
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp92_ = pixels;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp92__length1 = pixels_length1;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp93_ = o;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp94_ = _tmp92_[_tmp93_];
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp95_ = x;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp96_ = block_shift[_tmp95_ % 4];
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					sample = (_tmp94_ >> _tmp96_) & 0x3;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp97_ = sample;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					sample = (_tmp97_ * 255) / 3;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp98_ = pixel;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp98__length1 = pixel_length1;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp99_ = pixel;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp99__length1 = pixel_length1;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp100_ = pixel;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp100__length1 = pixel_length1;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp101_ = sample;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp100_[2] = (guchar) _tmp101_;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp102_ = _tmp100_[2];
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp99_[1] = _tmp102_;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp103_ = _tmp99_[1];
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp98_[0] = _tmp103_;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp104_ = _tmp98_[0];
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					return;
-#line 912 "page-view.c"
-				}
-			}
-		}
-	}
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp105_ = pixel;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp105__length1 = pixel_length1;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp106_ = pixels;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp106__length1 = pixels_length1;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp107_ = offset;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp108_ = x;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp109_ = depth;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp110_ = x;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp111_ = n_channels;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp112_ = page_view_get_sample (self, _tmp106_, _tmp106__length1, _tmp107_, _tmp108_, _tmp109_, _tmp110_ * _tmp111_);
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp105_[0] = _tmp112_;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp113_ = _tmp105_[0];
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp114_ = pixel;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp114__length1 = pixel_length1;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp115_ = pixels;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp115__length1 = pixels_length1;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp116_ = offset;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp117_ = x;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp118_ = depth;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp119_ = x;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp120_ = n_channels;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp121_ = page_view_get_sample (self, _tmp115_, _tmp115__length1, _tmp116_, _tmp117_, _tmp118_, (_tmp119_ * _tmp120_) + 1);
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp114_[1] = _tmp121_;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp122_ = _tmp114_[1];
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp123_ = pixel;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp123__length1 = pixel_length1;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp124_ = pixels;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp124__length1 = pixels_length1;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp125_ = offset;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp126_ = x;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp127_ = depth;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp128_ = x;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp129_ = n_channels;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp130_ = page_view_get_sample (self, _tmp124_, _tmp124__length1, _tmp125_, _tmp126_, _tmp127_, (_tmp128_ * _tmp129_) + 2);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp123_[2] = _tmp130_;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp131_ = _tmp123_[2];
-#line 989 "page-view.c"
-}
-
-
-static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble r, gdouble t, gdouble b, guchar* output, int output_length1, gint offset) {
-	gint L = 0;
-	gdouble _tmp0_ = 0.0;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	gint R = 0;
-	gdouble _tmp4_ = 0.0;
-	gint T = 0;
-	gdouble _tmp5_ = 0.0;
-	gint _tmp6_ = 0;
-	gdouble _tmp7_ = 0.0;
-	gint B = 0;
-	gdouble _tmp9_ = 0.0;
-	gdouble red = 0.0;
-	gdouble green = 0.0;
-	gdouble blue = 0.0;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
-	gdouble _tmp12_ = 0.0;
-	gdouble _tmp13_ = 0.0;
-	gboolean _tmp283_ = FALSE;
-	gdouble _tmp284_ = 0.0;
-	gint _tmp285_ = 0;
-	gboolean _tmp309_ = FALSE;
-	gdouble _tmp310_ = 0.0;
-	gint _tmp311_ = 0;
-	gboolean _tmp335_ = FALSE;
-	gdouble _tmp336_ = 0.0;
-	gint _tmp337_ = 0;
-	gboolean _tmp361_ = FALSE;
-	gdouble _tmp362_ = 0.0;
-	gint _tmp363_ = 0;
-	gdouble scale = 0.0;
-	gdouble _tmp387_ = 0.0;
-	gdouble _tmp388_ = 0.0;
-	gdouble _tmp389_ = 0.0;
-	gdouble _tmp390_ = 0.0;
-	guchar* _tmp391_ = NULL;
-	gint _tmp391__length1 = 0;
-	gint _tmp392_ = 0;
-	gdouble _tmp393_ = 0.0;
-	gdouble _tmp394_ = 0.0;
-	guchar _tmp395_ = '\0';
-	guchar* _tmp396_ = NULL;
-	gint _tmp396__length1 = 0;
-	gint _tmp397_ = 0;
-	gdouble _tmp398_ = 0.0;
-	gdouble _tmp399_ = 0.0;
-	guchar _tmp400_ = '\0';
-	guchar* _tmp401_ = NULL;
-	gint _tmp401__length1 = 0;
-	gint _tmp402_ = 0;
-	gdouble _tmp403_ = 0.0;
-	gdouble _tmp404_ = 0.0;
-	guchar _tmp405_ = '\0';
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (page != NULL);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = l;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	L = (gint) _tmp0_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = L;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = l;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (((gdouble) _tmp1_) != _tmp2_) {
-#line 1062 "page-view.c"
-		gint _tmp3_ = 0;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp3_ = L;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		L = _tmp3_ + 1;
-#line 1068 "page-view.c"
-	}
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = r;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	R = (gint) _tmp4_;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = t;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	T = (gint) _tmp5_;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = T;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = t;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (((gdouble) _tmp6_) != _tmp7_) {
-#line 1084 "page-view.c"
-		gint _tmp8_ = 0;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp8_ = T;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		T = _tmp8_ + 1;
-#line 1090 "page-view.c"
-	}
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = b;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	B = (gint) _tmp9_;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	red = 0.0;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	green = 0.0;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	blue = 0.0;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = r;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = l;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if ((_tmp12_ - _tmp13_) <= 1.0) {
-#line 1108 "page-view.c"
-		gdouble _tmp14_ = 0.0;
-		gdouble _tmp15_ = 0.0;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp14_ = r;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp15_ = l;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = ((gint) _tmp14_) == ((gint) _tmp15_);
-#line 1117 "page-view.c"
-	} else {
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = FALSE;
-#line 1121 "page-view.c"
-	}
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp11_) {
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = TRUE;
-#line 1127 "page-view.c"
-	} else {
-		gboolean _tmp16_ = FALSE;
-		gdouble _tmp17_ = 0.0;
-		gdouble _tmp18_ = 0.0;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp17_ = b;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp18_ = t;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp17_ - _tmp18_) <= 1.0) {
-#line 1138 "page-view.c"
-			gdouble _tmp19_ = 0.0;
-			gdouble _tmp20_ = 0.0;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp19_ = b;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp20_ = t;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp16_ = ((gint) _tmp19_) == ((gint) _tmp20_);
-#line 1147 "page-view.c"
-		} else {
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp16_ = FALSE;
-#line 1151 "page-view.c"
-		}
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = _tmp16_;
-#line 1155 "page-view.c"
-	}
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp10_) {
-#line 1159 "page-view.c"
-		gboolean _tmp21_ = FALSE;
-		gdouble _tmp22_ = 0.0;
-		gdouble _tmp23_ = 0.0;
-		gint _tmp41_ = 0;
-		gint _tmp42_ = 0;
-		gdouble scale = 0.0;
-		gdouble _tmp167_ = 0.0;
-		gdouble _tmp168_ = 0.0;
-		gdouble _tmp169_ = 0.0;
-		gdouble _tmp170_ = 0.0;
-		guchar* _tmp171_ = NULL;
-		gint _tmp171__length1 = 0;
-		gint _tmp172_ = 0;
-		gdouble _tmp173_ = 0.0;
-		gdouble _tmp174_ = 0.0;
-		guchar _tmp175_ = '\0';
-		guchar* _tmp176_ = NULL;
-		gint _tmp176__length1 = 0;
-		gint _tmp177_ = 0;
-		gdouble _tmp178_ = 0.0;
-		gdouble _tmp179_ = 0.0;
-		guchar _tmp180_ = '\0';
-		guchar* _tmp181_ = NULL;
-		gint _tmp181__length1 = 0;
-		gint _tmp182_ = 0;
-		gdouble _tmp183_ = 0.0;
-		gdouble _tmp184_ = 0.0;
-		guchar _tmp185_ = '\0';
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp22_ = l;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp23_ = r;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((gint) _tmp22_) == ((gint) _tmp23_)) {
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp21_ = TRUE;
-#line 1196 "page-view.c"
-		} else {
-			gdouble _tmp24_ = 0.0;
-			gdouble _tmp25_ = 0.0;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp24_ = t;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp25_ = b;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp21_ = ((gint) _tmp24_) == ((gint) _tmp25_);
-#line 1206 "page-view.c"
-		}
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp21_) {
-#line 1210 "page-view.c"
-			guchar p[3] = {0};
-			Page* _tmp26_ = NULL;
-			gdouble _tmp27_ = 0.0;
-			gdouble _tmp28_ = 0.0;
-			guchar* _tmp29_ = NULL;
-			gint _tmp29__length1 = 0;
-			gint _tmp30_ = 0;
-			guchar _tmp31_ = '\0';
-			guchar _tmp32_ = '\0';
-			guchar* _tmp33_ = NULL;
-			gint _tmp33__length1 = 0;
-			gint _tmp34_ = 0;
-			guchar _tmp35_ = '\0';
-			guchar _tmp36_ = '\0';
-			guchar* _tmp37_ = NULL;
-			gint _tmp37__length1 = 0;
-			gint _tmp38_ = 0;
-			guchar _tmp39_ = '\0';
-			guchar _tmp40_ = '\0';
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp26_ = page;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp27_ = l;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp28_ = t;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp26_, (gint) _tmp27_, (gint) _tmp28_, p, 3);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp29_ = output;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp29__length1 = output_length1;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp30_ = offset;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp31_ = p[0];
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp29_[_tmp30_] = _tmp31_;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp32_ = _tmp29_[_tmp30_];
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp33_ = output;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp33__length1 = output_length1;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp34_ = offset;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp35_ = p[1];
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp33_[_tmp34_ + 1] = _tmp35_;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp36_ = _tmp33_[_tmp34_ + 1];
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp37_ = output;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp37__length1 = output_length1;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp38_ = offset;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp39_ = p[2];
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp37_[_tmp38_ + 2] = _tmp39_;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp40_ = _tmp37_[_tmp38_ + 2];
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			return;
-#line 1276 "page-view.c"
-		}
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = L;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = R;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp41_ > _tmp42_) {
-#line 1284 "page-view.c"
-			guchar p[3] = {0};
-			Page* _tmp43_ = NULL;
-			gint _tmp44_ = 0;
-			gint _tmp45_ = 0;
-			gdouble _tmp46_ = 0.0;
-			guchar _tmp47_ = '\0';
-			gdouble _tmp48_ = 0.0;
-			gdouble _tmp49_ = 0.0;
-			gint _tmp50_ = 0;
-			gdouble _tmp51_ = 0.0;
-			gdouble _tmp52_ = 0.0;
-			guchar _tmp53_ = '\0';
-			gdouble _tmp54_ = 0.0;
-			gdouble _tmp55_ = 0.0;
-			gint _tmp56_ = 0;
-			gdouble _tmp57_ = 0.0;
-			gdouble _tmp58_ = 0.0;
-			guchar _tmp59_ = '\0';
-			gdouble _tmp60_ = 0.0;
-			gdouble _tmp61_ = 0.0;
-			gint _tmp62_ = 0;
-			gdouble _tmp63_ = 0.0;
-			Page* _tmp84_ = NULL;
-			gint _tmp85_ = 0;
-			gint _tmp86_ = 0;
-			gdouble _tmp87_ = 0.0;
-			guchar _tmp88_ = '\0';
-			gdouble _tmp89_ = 0.0;
-			gdouble _tmp90_ = 0.0;
-			gdouble _tmp91_ = 0.0;
-			gint _tmp92_ = 0;
-			gdouble _tmp93_ = 0.0;
-			guchar _tmp94_ = '\0';
-			gdouble _tmp95_ = 0.0;
-			gdouble _tmp96_ = 0.0;
-			gdouble _tmp97_ = 0.0;
-			gint _tmp98_ = 0;
-			gdouble _tmp99_ = 0.0;
-			guchar _tmp100_ = '\0';
-			gdouble _tmp101_ = 0.0;
-			gdouble _tmp102_ = 0.0;
-			gdouble _tmp103_ = 0.0;
-			gint _tmp104_ = 0;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp43_ = page;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp44_ = R;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp45_ = T;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp43_, _tmp44_, _tmp45_ - 1, p, 3);
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp46_ = red;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp47_ = p[0];
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp48_ = r;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp49_ = l;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp50_ = T;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp51_ = t;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			red = _tmp46_ + ((_tmp47_ * (_tmp48_ - _tmp49_)) * (_tmp50_ - _tmp51_));
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp52_ = green;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp53_ = p[1];
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp54_ = r;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp55_ = l;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp56_ = T;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp57_ = t;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			green = _tmp52_ + ((_tmp53_ * (_tmp54_ - _tmp55_)) * (_tmp56_ - _tmp57_));
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp58_ = blue;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp59_ = p[2];
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp60_ = r;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp61_ = l;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp62_ = T;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp63_ = t;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			blue = _tmp58_ + ((_tmp59_ * (_tmp60_ - _tmp61_)) * (_tmp62_ - _tmp63_));
-#line 1378 "page-view.c"
-			{
-				gint y = 0;
-				gint _tmp64_ = 0;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp64_ = T;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y = _tmp64_;
-#line 1386 "page-view.c"
-				{
-					gboolean _tmp65_ = FALSE;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp65_ = TRUE;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					while (TRUE) {
-#line 1393 "page-view.c"
-						gint _tmp67_ = 0;
-						gint _tmp68_ = 0;
-						Page* _tmp69_ = NULL;
-						gint _tmp70_ = 0;
-						gint _tmp71_ = 0;
-						gdouble _tmp72_ = 0.0;
-						guchar _tmp73_ = '\0';
-						gdouble _tmp74_ = 0.0;
-						gdouble _tmp75_ = 0.0;
-						gdouble _tmp76_ = 0.0;
-						guchar _tmp77_ = '\0';
-						gdouble _tmp78_ = 0.0;
-						gdouble _tmp79_ = 0.0;
-						gdouble _tmp80_ = 0.0;
-						guchar _tmp81_ = '\0';
-						gdouble _tmp82_ = 0.0;
-						gdouble _tmp83_ = 0.0;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						if (!_tmp65_) {
-#line 1413 "page-view.c"
-							gint _tmp66_ = 0;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp66_ = y;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							y = _tmp66_ + 1;
-#line 1419 "page-view.c"
-						}
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp65_ = FALSE;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp67_ = y;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp68_ = B;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						if (!(_tmp67_ < _tmp68_)) {
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							break;
-#line 1431 "page-view.c"
-						}
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp69_ = page;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp70_ = R;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp71_ = y;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						page_view_get_pixel (self, _tmp69_, _tmp70_, _tmp71_, p, 3);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp72_ = red;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp73_ = p[0];
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp74_ = r;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp75_ = l;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						red = _tmp72_ + (_tmp73_ * (_tmp74_ - _tmp75_));
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp76_ = green;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp77_ = p[1];
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp78_ = r;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp79_ = l;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						green = _tmp76_ + (_tmp77_ * (_tmp78_ - _tmp79_));
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp80_ = blue;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp81_ = p[2];
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp82_ = r;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp83_ = l;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						blue = _tmp80_ + (_tmp81_ * (_tmp82_ - _tmp83_));
-#line 1471 "page-view.c"
-					}
-				}
-			}
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp84_ = page;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp85_ = R;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp86_ = B;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp84_, _tmp85_, _tmp86_, p, 3);
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp87_ = red;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp88_ = p[0];
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp89_ = r;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp90_ = l;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp91_ = b;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp92_ = B;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			red = _tmp87_ + ((_tmp88_ * (_tmp89_ - _tmp90_)) * (_tmp91_ - _tmp92_));
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp93_ = green;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp94_ = p[1];
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp95_ = r;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp96_ = l;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp97_ = b;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp98_ = B;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			green = _tmp93_ + ((_tmp94_ * (_tmp95_ - _tmp96_)) * (_tmp97_ - _tmp98_));
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp99_ = blue;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp100_ = p[2];
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp101_ = r;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp102_ = l;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp103_ = b;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp104_ = B;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			blue = _tmp99_ + ((_tmp100_ * (_tmp101_ - _tmp102_)) * (_tmp103_ - _tmp104_));
-#line 1525 "page-view.c"
-		} else {
-			guchar p[3] = {0};
-			Page* _tmp105_ = NULL;
-			gint _tmp106_ = 0;
-			gint _tmp107_ = 0;
-			gdouble _tmp108_ = 0.0;
-			guchar _tmp109_ = '\0';
-			gdouble _tmp110_ = 0.0;
-			gdouble _tmp111_ = 0.0;
-			gint _tmp112_ = 0;
-			gdouble _tmp113_ = 0.0;
-			gdouble _tmp114_ = 0.0;
-			guchar _tmp115_ = '\0';
-			gdouble _tmp116_ = 0.0;
-			gdouble _tmp117_ = 0.0;
-			gint _tmp118_ = 0;
-			gdouble _tmp119_ = 0.0;
-			gdouble _tmp120_ = 0.0;
-			guchar _tmp121_ = '\0';
-			gdouble _tmp122_ = 0.0;
-			gdouble _tmp123_ = 0.0;
-			gint _tmp124_ = 0;
-			gdouble _tmp125_ = 0.0;
-			Page* _tmp146_ = NULL;
-			gint _tmp147_ = 0;
-			gint _tmp148_ = 0;
-			gdouble _tmp149_ = 0.0;
-			guchar _tmp150_ = '\0';
-			gdouble _tmp151_ = 0.0;
-			gdouble _tmp152_ = 0.0;
-			gdouble _tmp153_ = 0.0;
-			gint _tmp154_ = 0;
-			gdouble _tmp155_ = 0.0;
-			guchar _tmp156_ = '\0';
-			gdouble _tmp157_ = 0.0;
-			gdouble _tmp158_ = 0.0;
-			gdouble _tmp159_ = 0.0;
-			gint _tmp160_ = 0;
-			gdouble _tmp161_ = 0.0;
-			guchar _tmp162_ = '\0';
-			gdouble _tmp163_ = 0.0;
-			gdouble _tmp164_ = 0.0;
-			gdouble _tmp165_ = 0.0;
-			gint _tmp166_ = 0;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp105_ = page;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp106_ = L;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp107_ = B;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp105_, _tmp106_ - 1, _tmp107_, p, 3);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp108_ = red;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp109_ = p[0];
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp110_ = b;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp111_ = t;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp112_ = L;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp113_ = l;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			red = _tmp108_ + ((_tmp109_ * (_tmp110_ - _tmp111_)) * (_tmp112_ - _tmp113_));
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp114_ = green;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp115_ = p[1];
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp116_ = b;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp117_ = t;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp118_ = L;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp119_ = l;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			green = _tmp114_ + ((_tmp115_ * (_tmp116_ - _tmp117_)) * (_tmp118_ - _tmp119_));
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp120_ = blue;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp121_ = p[2];
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp122_ = b;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp123_ = t;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp124_ = L;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp125_ = l;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			blue = _tmp120_ + ((_tmp121_ * (_tmp122_ - _tmp123_)) * (_tmp124_ - _tmp125_));
-#line 1620 "page-view.c"
-			{
-				gint x = 0;
-				gint _tmp126_ = 0;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp126_ = L;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x = _tmp126_;
-#line 1628 "page-view.c"
-				{
-					gboolean _tmp127_ = FALSE;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp127_ = TRUE;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					while (TRUE) {
-#line 1635 "page-view.c"
-						gint _tmp129_ = 0;
-						gint _tmp130_ = 0;
-						Page* _tmp131_ = NULL;
-						gint _tmp132_ = 0;
-						gint _tmp133_ = 0;
-						gdouble _tmp134_ = 0.0;
-						guchar _tmp135_ = '\0';
-						gdouble _tmp136_ = 0.0;
-						gdouble _tmp137_ = 0.0;
-						gdouble _tmp138_ = 0.0;
-						guchar _tmp139_ = '\0';
-						gdouble _tmp140_ = 0.0;
-						gdouble _tmp141_ = 0.0;
-						gdouble _tmp142_ = 0.0;
-						guchar _tmp143_ = '\0';
-						gdouble _tmp144_ = 0.0;
-						gdouble _tmp145_ = 0.0;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						if (!_tmp127_) {
-#line 1655 "page-view.c"
-							gint _tmp128_ = 0;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp128_ = x;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							x = _tmp128_ + 1;
-#line 1661 "page-view.c"
-						}
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp127_ = FALSE;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp129_ = x;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp130_ = R;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						if (!(_tmp129_ < _tmp130_)) {
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							break;
-#line 1673 "page-view.c"
-						}
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp131_ = page;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp132_ = x;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp133_ = B;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						page_view_get_pixel (self, _tmp131_, _tmp132_, _tmp133_, p, 3);
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp134_ = red;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp135_ = p[0];
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp136_ = b;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp137_ = t;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						red = _tmp134_ + (_tmp135_ * (_tmp136_ - _tmp137_));
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp138_ = green;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp139_ = p[1];
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp140_ = b;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp141_ = t;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						green = _tmp138_ + (_tmp139_ * (_tmp140_ - _tmp141_));
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp142_ = blue;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp143_ = p[2];
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp144_ = b;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp145_ = t;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						blue = _tmp142_ + (_tmp143_ * (_tmp144_ - _tmp145_));
-#line 1713 "page-view.c"
-					}
-				}
-			}
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp146_ = page;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp147_ = R;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp148_ = B;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp146_, _tmp147_, _tmp148_, p, 3);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp149_ = red;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp150_ = p[0];
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp151_ = b;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp152_ = t;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp153_ = r;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp154_ = R;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			red = _tmp149_ + ((_tmp150_ * (_tmp151_ - _tmp152_)) * (_tmp153_ - _tmp154_));
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp155_ = green;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp156_ = p[1];
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp157_ = b;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp158_ = t;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp159_ = r;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp160_ = R;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			green = _tmp155_ + ((_tmp156_ * (_tmp157_ - _tmp158_)) * (_tmp159_ - _tmp160_));
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp161_ = blue;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp162_ = p[2];
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp163_ = b;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp164_ = t;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp165_ = r;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp166_ = R;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			blue = _tmp161_ + ((_tmp162_ * (_tmp163_ - _tmp164_)) * (_tmp165_ - _tmp166_));
-#line 1767 "page-view.c"
-		}
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp167_ = r;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp168_ = l;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp169_ = b;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp170_ = t;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		scale = 1.0 / ((_tmp167_ - _tmp168_) * (_tmp169_ - _tmp170_));
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp171_ = output;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp171__length1 = output_length1;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp172_ = offset;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp173_ = red;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp174_ = scale;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp171_[_tmp172_] = (guchar) ((_tmp173_ * _tmp174_) + 0.5);
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp175_ = _tmp171_[_tmp172_];
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp176_ = output;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp176__length1 = output_length1;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp177_ = offset;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp178_ = green;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp179_ = scale;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp176_[_tmp177_ + 1] = (guchar) ((_tmp178_ * _tmp179_) + 0.5);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp180_ = _tmp176_[_tmp177_ + 1];
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp181_ = output;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp181__length1 = output_length1;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp182_ = offset;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp183_ = blue;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp184_ = scale;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp181_[_tmp182_ + 2] = (guchar) ((_tmp183_ * _tmp184_) + 0.5);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp185_ = _tmp181_[_tmp182_ + 2];
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 1823 "page-view.c"
-	}
-	{
-		gint x = 0;
-		gint _tmp186_ = 0;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp186_ = L;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp186_;
-#line 1832 "page-view.c"
-		{
-			gboolean _tmp187_ = FALSE;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp187_ = TRUE;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			while (TRUE) {
-#line 1839 "page-view.c"
-				gint _tmp189_ = 0;
-				gint _tmp190_ = 0;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!_tmp187_) {
-#line 1844 "page-view.c"
-					gint _tmp188_ = 0;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp188_ = x;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = _tmp188_ + 1;
-#line 1850 "page-view.c"
-				}
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp187_ = FALSE;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp189_ = x;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp190_ = R;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!(_tmp189_ < _tmp190_)) {
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					break;
-#line 1862 "page-view.c"
-				}
-				{
-					gint y = 0;
-					gint _tmp191_ = 0;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp191_ = T;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = _tmp191_;
-#line 1871 "page-view.c"
-					{
-						gboolean _tmp192_ = FALSE;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp192_ = TRUE;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						while (TRUE) {
-#line 1878 "page-view.c"
-							gint _tmp194_ = 0;
-							gint _tmp195_ = 0;
-							guchar p[3] = {0};
-							Page* _tmp196_ = NULL;
-							gint _tmp197_ = 0;
-							gint _tmp198_ = 0;
-							gdouble _tmp199_ = 0.0;
-							guchar _tmp200_ = '\0';
-							gdouble _tmp201_ = 0.0;
-							guchar _tmp202_ = '\0';
-							gdouble _tmp203_ = 0.0;
-							guchar _tmp204_ = '\0';
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!_tmp192_) {
-#line 1893 "page-view.c"
-								gint _tmp193_ = 0;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp193_ = y;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								y = _tmp193_ + 1;
-#line 1899 "page-view.c"
-							}
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp192_ = FALSE;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp194_ = y;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp195_ = B;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!(_tmp194_ < _tmp195_)) {
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								break;
-#line 1911 "page-view.c"
-							}
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp196_ = page;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp197_ = x;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp198_ = y;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							page_view_get_pixel (self, _tmp196_, _tmp197_, _tmp198_, p, 3);
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp199_ = red;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp200_ = p[0];
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							red = _tmp199_ + _tmp200_;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp201_ = green;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp202_ = p[1];
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							green = _tmp201_ + _tmp202_;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp203_ = blue;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp204_ = p[2];
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							blue = _tmp203_ + _tmp204_;
-#line 1939 "page-view.c"
-						}
-					}
-				}
-			}
-		}
-	}
-	{
-		gint x = 0;
-		gint _tmp205_ = 0;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp205_ = L;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp205_;
-#line 1953 "page-view.c"
-		{
-			gboolean _tmp206_ = FALSE;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp206_ = TRUE;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			while (TRUE) {
-#line 1960 "page-view.c"
-				gint _tmp208_ = 0;
-				gint _tmp209_ = 0;
-				gdouble _tmp210_ = 0.0;
-				gint _tmp211_ = 0;
-				gdouble _tmp227_ = 0.0;
-				gint _tmp228_ = 0;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!_tmp206_) {
-#line 1969 "page-view.c"
-					gint _tmp207_ = 0;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp207_ = x;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = _tmp207_ + 1;
-#line 1975 "page-view.c"
-				}
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp206_ = FALSE;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp208_ = x;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp209_ = R;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!(_tmp208_ < _tmp209_)) {
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					break;
-#line 1987 "page-view.c"
-				}
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp210_ = t;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp211_ = T;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp210_ != ((gdouble) _tmp211_)) {
-#line 1995 "page-view.c"
-					guchar p[3] = {0};
-					Page* _tmp212_ = NULL;
-					gint _tmp213_ = 0;
-					gint _tmp214_ = 0;
-					gdouble _tmp215_ = 0.0;
-					guchar _tmp216_ = '\0';
-					gint _tmp217_ = 0;
-					gdouble _tmp218_ = 0.0;
-					gdouble _tmp219_ = 0.0;
-					guchar _tmp220_ = '\0';
-					gint _tmp221_ = 0;
-					gdouble _tmp222_ = 0.0;
-					gdouble _tmp223_ = 0.0;
-					guchar _tmp224_ = '\0';
-					gint _tmp225_ = 0;
-					gdouble _tmp226_ = 0.0;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp212_ = page;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp213_ = x;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp214_ = T;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					page_view_get_pixel (self, _tmp212_, _tmp213_, _tmp214_ - 1, p, 3);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp215_ = red;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp216_ = p[0];
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp217_ = T;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp218_ = t;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					red = _tmp215_ + (_tmp216_ * (_tmp217_ - _tmp218_));
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp219_ = green;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp220_ = p[1];
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp221_ = T;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp222_ = t;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					green = _tmp219_ + (_tmp220_ * (_tmp221_ - _tmp222_));
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp223_ = blue;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp224_ = p[2];
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp225_ = T;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp226_ = t;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					blue = _tmp223_ + (_tmp224_ * (_tmp225_ - _tmp226_));
-#line 2050 "page-view.c"
-				}
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp227_ = b;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp228_ = B;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp227_ != ((gdouble) _tmp228_)) {
-#line 2058 "page-view.c"
-					guchar p[3] = {0};
-					Page* _tmp229_ = NULL;
-					gint _tmp230_ = 0;
-					gint _tmp231_ = 0;
-					gdouble _tmp232_ = 0.0;
-					guchar _tmp233_ = '\0';
-					gdouble _tmp234_ = 0.0;
-					gint _tmp235_ = 0;
-					gdouble _tmp236_ = 0.0;
-					guchar _tmp237_ = '\0';
-					gdouble _tmp238_ = 0.0;
-					gint _tmp239_ = 0;
-					gdouble _tmp240_ = 0.0;
-					guchar _tmp241_ = '\0';
-					gdouble _tmp242_ = 0.0;
-					gint _tmp243_ = 0;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp229_ = page;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp230_ = x;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp231_ = B;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					page_view_get_pixel (self, _tmp229_, _tmp230_, _tmp231_, p, 3);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp232_ = red;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp233_ = p[0];
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp234_ = b;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp235_ = B;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					red = _tmp232_ + (_tmp233_ * (_tmp234_ - _tmp235_));
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp236_ = green;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp237_ = p[1];
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp238_ = b;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp239_ = B;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					green = _tmp236_ + (_tmp237_ * (_tmp238_ - _tmp239_));
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp240_ = blue;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp241_ = p[2];
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp242_ = b;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp243_ = B;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					blue = _tmp240_ + (_tmp241_ * (_tmp242_ - _tmp243_));
-#line 2113 "page-view.c"
-				}
-			}
-		}
-	}
-	{
-		gint y = 0;
-		gint _tmp244_ = 0;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp244_ = T;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		y = _tmp244_;
-#line 2125 "page-view.c"
-		{
-			gboolean _tmp245_ = FALSE;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp245_ = TRUE;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			while (TRUE) {
-#line 2132 "page-view.c"
-				gint _tmp247_ = 0;
-				gint _tmp248_ = 0;
-				gdouble _tmp249_ = 0.0;
-				gint _tmp250_ = 0;
-				gdouble _tmp266_ = 0.0;
-				gint _tmp267_ = 0;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!_tmp245_) {
-#line 2141 "page-view.c"
-					gint _tmp246_ = 0;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp246_ = y;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = _tmp246_ + 1;
-#line 2147 "page-view.c"
-				}
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp245_ = FALSE;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp247_ = y;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp248_ = B;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!(_tmp247_ < _tmp248_)) {
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					break;
-#line 2159 "page-view.c"
-				}
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp249_ = l;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp250_ = L;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp249_ != ((gdouble) _tmp250_)) {
-#line 2167 "page-view.c"
-					guchar p[3] = {0};
-					Page* _tmp251_ = NULL;
-					gint _tmp252_ = 0;
-					gint _tmp253_ = 0;
-					gdouble _tmp254_ = 0.0;
-					guchar _tmp255_ = '\0';
-					gint _tmp256_ = 0;
-					gdouble _tmp257_ = 0.0;
-					gdouble _tmp258_ = 0.0;
-					guchar _tmp259_ = '\0';
-					gint _tmp260_ = 0;
-					gdouble _tmp261_ = 0.0;
-					gdouble _tmp262_ = 0.0;
-					guchar _tmp263_ = '\0';
-					gint _tmp264_ = 0;
-					gdouble _tmp265_ = 0.0;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp251_ = page;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp252_ = L;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp253_ = y;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					page_view_get_pixel (self, _tmp251_, _tmp252_ - 1, _tmp253_, p, 3);
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp254_ = red;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp255_ = p[0];
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp256_ = L;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp257_ = l;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					red = _tmp254_ + (_tmp255_ * (_tmp256_ - _tmp257_));
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp258_ = green;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp259_ = p[1];
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp260_ = L;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp261_ = l;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					green = _tmp258_ + (_tmp259_ * (_tmp260_ - _tmp261_));
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp262_ = blue;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp263_ = p[2];
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp264_ = L;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp265_ = l;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					blue = _tmp262_ + (_tmp263_ * (_tmp264_ - _tmp265_));
-#line 2222 "page-view.c"
-				}
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp266_ = r;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp267_ = R;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp266_ != ((gdouble) _tmp267_)) {
-#line 2230 "page-view.c"
-					guchar p[3] = {0};
-					Page* _tmp268_ = NULL;
-					gint _tmp269_ = 0;
-					gint _tmp270_ = 0;
-					gdouble _tmp271_ = 0.0;
-					guchar _tmp272_ = '\0';
-					gdouble _tmp273_ = 0.0;
-					gint _tmp274_ = 0;
-					gdouble _tmp275_ = 0.0;
-					guchar _tmp276_ = '\0';
-					gdouble _tmp277_ = 0.0;
-					gint _tmp278_ = 0;
-					gdouble _tmp279_ = 0.0;
-					guchar _tmp280_ = '\0';
-					gdouble _tmp281_ = 0.0;
-					gint _tmp282_ = 0;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp268_ = page;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp269_ = R;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp270_ = y;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					page_view_get_pixel (self, _tmp268_, _tmp269_, _tmp270_, p, 3);
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp271_ = red;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp272_ = p[0];
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp273_ = r;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp274_ = R;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					red = _tmp271_ + (_tmp272_ * (_tmp273_ - _tmp274_));
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp275_ = green;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp276_ = p[1];
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp277_ = r;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp278_ = R;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					green = _tmp275_ + (_tmp276_ * (_tmp277_ - _tmp278_));
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp279_ = blue;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp280_ = p[2];
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp281_ = r;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp282_ = R;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					blue = _tmp279_ + (_tmp280_ * (_tmp281_ - _tmp282_));
-#line 2285 "page-view.c"
-				}
-			}
-		}
-	}
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp284_ = l;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp285_ = L;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp284_ != ((gdouble) _tmp285_)) {
-#line 2296 "page-view.c"
-		gdouble _tmp286_ = 0.0;
-		gint _tmp287_ = 0;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp286_ = t;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp287_ = T;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp283_ = _tmp286_ != ((gdouble) _tmp287_);
-#line 2305 "page-view.c"
-	} else {
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp283_ = FALSE;
-#line 2309 "page-view.c"
-	}
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp283_) {
-#line 2313 "page-view.c"
-		guchar p[3] = {0};
-		Page* _tmp288_ = NULL;
-		gint _tmp289_ = 0;
-		gint _tmp290_ = 0;
-		gdouble _tmp291_ = 0.0;
-		guchar _tmp292_ = '\0';
-		gint _tmp293_ = 0;
-		gdouble _tmp294_ = 0.0;
-		gint _tmp295_ = 0;
-		gdouble _tmp296_ = 0.0;
-		gdouble _tmp297_ = 0.0;
-		guchar _tmp298_ = '\0';
-		gint _tmp299_ = 0;
-		gdouble _tmp300_ = 0.0;
-		gint _tmp301_ = 0;
-		gdouble _tmp302_ = 0.0;
-		gdouble _tmp303_ = 0.0;
-		guchar _tmp304_ = '\0';
-		gint _tmp305_ = 0;
-		gdouble _tmp306_ = 0.0;
-		gint _tmp307_ = 0;
-		gdouble _tmp308_ = 0.0;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp288_ = page;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp289_ = L;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp290_ = T;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_view_get_pixel (self, _tmp288_, _tmp289_ - 1, _tmp290_ - 1, p, 3);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp291_ = red;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp292_ = p[0];
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp293_ = L;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp294_ = l;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp295_ = T;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp296_ = t;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		red = _tmp291_ + ((_tmp292_ * (_tmp293_ - _tmp294_)) * (_tmp295_ - _tmp296_));
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp297_ = green;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp298_ = p[1];
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp299_ = L;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp300_ = l;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp301_ = T;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp302_ = t;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		green = _tmp297_ + ((_tmp298_ * (_tmp299_ - _tmp300_)) * (_tmp301_ - _tmp302_));
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp303_ = blue;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp304_ = p[2];
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp305_ = L;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp306_ = l;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp307_ = T;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp308_ = t;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		blue = _tmp303_ + ((_tmp304_ * (_tmp305_ - _tmp306_)) * (_tmp307_ - _tmp308_));
-#line 2386 "page-view.c"
-	}
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp310_ = r;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp311_ = R;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp310_ != ((gdouble) _tmp311_)) {
-#line 2394 "page-view.c"
-		gdouble _tmp312_ = 0.0;
-		gint _tmp313_ = 0;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp312_ = t;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp313_ = T;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp309_ = _tmp312_ != ((gdouble) _tmp313_);
-#line 2403 "page-view.c"
-	} else {
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp309_ = FALSE;
-#line 2407 "page-view.c"
-	}
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp309_) {
-#line 2411 "page-view.c"
-		guchar p[3] = {0};
-		Page* _tmp314_ = NULL;
-		gint _tmp315_ = 0;
-		gint _tmp316_ = 0;
-		gdouble _tmp317_ = 0.0;
-		guchar _tmp318_ = '\0';
-		gdouble _tmp319_ = 0.0;
-		gint _tmp320_ = 0;
-		gint _tmp321_ = 0;
-		gdouble _tmp322_ = 0.0;
-		gdouble _tmp323_ = 0.0;
-		guchar _tmp324_ = '\0';
-		gdouble _tmp325_ = 0.0;
-		gint _tmp326_ = 0;
-		gint _tmp327_ = 0;
-		gdouble _tmp328_ = 0.0;
-		gdouble _tmp329_ = 0.0;
-		guchar _tmp330_ = '\0';
-		gdouble _tmp331_ = 0.0;
-		gint _tmp332_ = 0;
-		gint _tmp333_ = 0;
-		gdouble _tmp334_ = 0.0;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp314_ = page;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp315_ = R;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp316_ = T;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_view_get_pixel (self, _tmp314_, _tmp315_, _tmp316_ - 1, p, 3);
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp317_ = red;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp318_ = p[0];
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp319_ = r;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp320_ = R;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp321_ = T;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp322_ = t;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		red = _tmp317_ + ((_tmp318_ * (_tmp319_ - _tmp320_)) * (_tmp321_ - _tmp322_));
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp323_ = green;
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp324_ = p[1];
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp325_ = r;
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp326_ = R;
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp327_ = T;
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp328_ = t;
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		green = _tmp323_ + ((_tmp324_ * (_tmp325_ - _tmp326_)) * (_tmp327_ - _tmp328_));
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp329_ = blue;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp330_ = p[2];
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp331_ = r;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp332_ = R;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp333_ = T;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp334_ = t;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		blue = _tmp329_ + ((_tmp330_ * (_tmp331_ - _tmp332_)) * (_tmp333_ - _tmp334_));
-#line 2484 "page-view.c"
-	}
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp336_ = r;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp337_ = R;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp336_ != ((gdouble) _tmp337_)) {
-#line 2492 "page-view.c"
-		gdouble _tmp338_ = 0.0;
-		gint _tmp339_ = 0;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp338_ = b;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp339_ = B;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp335_ = _tmp338_ != ((gdouble) _tmp339_);
-#line 2501 "page-view.c"
-	} else {
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp335_ = FALSE;
-#line 2505 "page-view.c"
-	}
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp335_) {
-#line 2509 "page-view.c"
-		guchar p[3] = {0};
-		Page* _tmp340_ = NULL;
-		gint _tmp341_ = 0;
-		gint _tmp342_ = 0;
-		gdouble _tmp343_ = 0.0;
-		guchar _tmp344_ = '\0';
-		gdouble _tmp345_ = 0.0;
-		gint _tmp346_ = 0;
-		gdouble _tmp347_ = 0.0;
-		gint _tmp348_ = 0;
-		gdouble _tmp349_ = 0.0;
-		guchar _tmp350_ = '\0';
-		gdouble _tmp351_ = 0.0;
-		gint _tmp352_ = 0;
-		gdouble _tmp353_ = 0.0;
-		gint _tmp354_ = 0;
-		gdouble _tmp355_ = 0.0;
-		guchar _tmp356_ = '\0';
-		gdouble _tmp357_ = 0.0;
-		gint _tmp358_ = 0;
-		gdouble _tmp359_ = 0.0;
-		gint _tmp360_ = 0;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp340_ = page;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp341_ = R;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp342_ = B;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_view_get_pixel (self, _tmp340_, _tmp341_, _tmp342_, p, 3);
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp343_ = red;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp344_ = p[0];
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp345_ = r;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp346_ = R;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp347_ = b;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp348_ = B;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		red = _tmp343_ + ((_tmp344_ * (_tmp345_ - _tmp346_)) * (_tmp347_ - _tmp348_));
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp349_ = green;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp350_ = p[1];
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp351_ = r;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp352_ = R;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp353_ = b;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp354_ = B;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		green = _tmp349_ + ((_tmp350_ * (_tmp351_ - _tmp352_)) * (_tmp353_ - _tmp354_));
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp355_ = blue;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp356_ = p[2];
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp357_ = r;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp358_ = R;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp359_ = b;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp360_ = B;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		blue = _tmp355_ + ((_tmp356_ * (_tmp357_ - _tmp358_)) * (_tmp359_ - _tmp360_));
-#line 2582 "page-view.c"
-	}
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp362_ = l;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp363_ = L;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp362_ != ((gdouble) _tmp363_)) {
-#line 2590 "page-view.c"
-		gdouble _tmp364_ = 0.0;
-		gint _tmp365_ = 0;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp364_ = b;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp365_ = B;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp361_ = _tmp364_ != ((gdouble) _tmp365_);
-#line 2599 "page-view.c"
-	} else {
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp361_ = FALSE;
-#line 2603 "page-view.c"
-	}
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp361_) {
-#line 2607 "page-view.c"
-		guchar p[3] = {0};
-		Page* _tmp366_ = NULL;
-		gint _tmp367_ = 0;
-		gint _tmp368_ = 0;
-		gdouble _tmp369_ = 0.0;
-		guchar _tmp370_ = '\0';
-		gint _tmp371_ = 0;
-		gdouble _tmp372_ = 0.0;
-		gdouble _tmp373_ = 0.0;
-		gint _tmp374_ = 0;
-		gdouble _tmp375_ = 0.0;
-		guchar _tmp376_ = '\0';
-		gint _tmp377_ = 0;
-		gdouble _tmp378_ = 0.0;
-		gdouble _tmp379_ = 0.0;
-		gint _tmp380_ = 0;
-		gdouble _tmp381_ = 0.0;
-		guchar _tmp382_ = '\0';
-		gint _tmp383_ = 0;
-		gdouble _tmp384_ = 0.0;
-		gdouble _tmp385_ = 0.0;
-		gint _tmp386_ = 0;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp366_ = page;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp367_ = L;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp368_ = B;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_view_get_pixel (self, _tmp366_, _tmp367_ - 1, _tmp368_, p, 3);
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp369_ = red;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp370_ = p[0];
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp371_ = L;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp372_ = l;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp373_ = b;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp374_ = B;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		red = _tmp369_ + ((_tmp370_ * (_tmp371_ - _tmp372_)) * (_tmp373_ - _tmp374_));
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp375_ = green;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp376_ = p[1];
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp377_ = L;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp378_ = l;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp379_ = b;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp380_ = B;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		green = _tmp375_ + ((_tmp376_ * (_tmp377_ - _tmp378_)) * (_tmp379_ - _tmp380_));
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp381_ = blue;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp382_ = p[2];
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp383_ = L;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp384_ = l;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp385_ = b;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp386_ = B;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		blue = _tmp381_ + ((_tmp382_ * (_tmp383_ - _tmp384_)) * (_tmp385_ - _tmp386_));
-#line 2680 "page-view.c"
-	}
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp387_ = r;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp388_ = l;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp389_ = b;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp390_ = t;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	scale = 1.0 / ((_tmp387_ - _tmp388_) * (_tmp389_ - _tmp390_));
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp391_ = output;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp391__length1 = output_length1;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp392_ = offset;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp393_ = red;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp394_ = scale;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp391_[_tmp392_] = (guchar) ((_tmp393_ * _tmp394_) + 0.5);
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp395_ = _tmp391_[_tmp392_];
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp396_ = output;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp396__length1 = output_length1;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp397_ = offset;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp398_ = green;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp399_ = scale;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp396_[_tmp397_ + 1] = (guchar) ((_tmp398_ * _tmp399_) + 0.5);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp400_ = _tmp396_[_tmp397_ + 1];
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp401_ = output;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp401__length1 = output_length1;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp402_ = offset;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp403_ = blue;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp404_ = scale;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp401_[_tmp402_ + 2] = (guchar) ((_tmp403_ * _tmp404_) + 0.5);
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp405_ = _tmp401_[_tmp402_ + 2];
-#line 2734 "page-view.c"
-}
-
-
-static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** output_image, gint output_width, gint output_height, ScanDirection scan_direction, gint old_scan_line, gint scan_line) {
-	gint input_width = 0;
-	Page* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint input_height = 0;
-	Page* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint L = 0;
-	gint R = 0;
-	gint T = 0;
-	gint B = 0;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	GdkPixbuf* _tmp8_ = NULL;
-	gint _tmp58_ = 0;
-	gint _tmp59_ = 0;
-	gint _tmp61_ = 0;
-	gint _tmp62_ = 0;
-	gint _tmp64_ = 0;
-	gint _tmp65_ = 0;
-	gint _tmp66_ = 0;
-	gint _tmp67_ = 0;
-	gint _tmp68_ = 0;
-	gint _tmp69_ = 0;
-	GdkPixbuf* _tmp70_ = NULL;
-	guchar* output = NULL;
-	GdkPixbuf* _tmp71_ = NULL;
-	guint8* _tmp72_ = NULL;
-	gint output_length1 = 0;
-	gint _output_size_ = 0;
-	gint output_rowstride = 0;
-	GdkPixbuf* _tmp73_ = NULL;
-	gint _tmp74_ = 0;
-	gint _tmp75_ = 0;
-	gint output_n_channels = 0;
-	GdkPixbuf* _tmp76_ = NULL;
-	gint _tmp77_ = 0;
-	gint _tmp78_ = 0;
-	Page* _tmp79_ = NULL;
-	gboolean _tmp80_ = FALSE;
-	gboolean _tmp81_ = FALSE;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (page != NULL);
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = page;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = page_get_width (_tmp0_);
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = _tmp1_;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	input_width = _tmp2_;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = page;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = page_get_height (_tmp3_);
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = _tmp4_;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	input_height = _tmp5_;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = *output_image;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp8_ == NULL) {
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = TRUE;
-#line 2807 "page-view.c"
-	} else {
-		GdkPixbuf* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp9_ = *output_image;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = gdk_pixbuf_get_width (_tmp9_);
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = _tmp10_;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp12_ = output_width;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = _tmp11_ != _tmp12_;
-#line 2823 "page-view.c"
-	}
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp7_) {
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp6_ = TRUE;
-#line 2829 "page-view.c"
-	} else {
-		GdkPixbuf* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp13_ = *output_image;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp14_ = gdk_pixbuf_get_height (_tmp13_);
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp15_ = _tmp14_;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp16_ = output_height;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp6_ = _tmp15_ != _tmp16_;
-#line 2845 "page-view.c"
-	}
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp6_) {
-#line 2849 "page-view.c"
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-		GdkPixbuf* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp17_ = output_width;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp18_ = output_height;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp19_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp17_, _tmp18_);
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_object_unref0 (*output_image);
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		*output_image = _tmp19_;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		L = 0;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp20_ = output_width;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		R = _tmp20_ - 1;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		T = 0;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp21_ = output_height;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		B = _tmp21_ - 1;
-#line 2877 "page-view.c"
-	} else {
-		ScanDirection _tmp22_ = 0;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp22_ = scan_direction;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		switch (_tmp22_) {
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 2886 "page-view.c"
-			{
-				gint _tmp23_ = 0;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = 0;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp23_ = output_width;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = _tmp23_ - 1;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp24_ = old_scan_line;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp25_ = output_height;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp26_ = input_height;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				T = (gint) ((((gdouble) _tmp24_) * _tmp25_) / _tmp26_);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp27_ = scan_line;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp28_ = output_height;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp29_ = input_height;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = (gint) (((((gdouble) _tmp27_) * _tmp28_) / _tmp29_) + 0.5);
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 2919 "page-view.c"
-			}
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 2923 "page-view.c"
-			{
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
-				gint _tmp32_ = 0;
-				gint _tmp33_ = 0;
-				gint _tmp34_ = 0;
-				gint _tmp35_ = 0;
-				gint _tmp36_ = 0;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp30_ = old_scan_line;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp31_ = output_width;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp32_ = input_width;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = (gint) ((((gdouble) _tmp30_) * _tmp31_) / _tmp32_);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp33_ = scan_line;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp34_ = output_width;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp35_ = input_width;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = (gint) (((((gdouble) _tmp33_) * _tmp34_) / _tmp35_) + 0.5);
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				T = 0;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp36_ = output_height;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = _tmp36_ - 1;
-#line 445 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 2956 "page-view.c"
-			}
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 2960 "page-view.c"
-			{
-				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
-				gint _tmp39_ = 0;
-				gint _tmp40_ = 0;
-				gint _tmp41_ = 0;
-				gint _tmp42_ = 0;
-				gint _tmp43_ = 0;
-				gint _tmp44_ = 0;
-				gint _tmp45_ = 0;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = 0;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp37_ = output_width;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = _tmp37_ - 1;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp38_ = input_height;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp39_ = scan_line;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp40_ = output_height;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp41_ = input_height;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				T = (gint) ((((gdouble) (_tmp38_ - _tmp39_)) * _tmp40_) / _tmp41_);
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp42_ = input_height;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp43_ = old_scan_line;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp44_ = output_height;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp45_ = input_height;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = (gint) (((((gdouble) (_tmp42_ - _tmp43_)) * _tmp44_) / _tmp45_) + 0.5);
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 2999 "page-view.c"
-			}
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 3003 "page-view.c"
-			{
-				gint _tmp46_ = 0;
-				gint _tmp47_ = 0;
-				gint _tmp48_ = 0;
-				gint _tmp49_ = 0;
-				gint _tmp50_ = 0;
-				gint _tmp51_ = 0;
-				gint _tmp52_ = 0;
-				gint _tmp53_ = 0;
-				gint _tmp54_ = 0;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp46_ = input_width;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp47_ = scan_line;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp48_ = output_width;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp49_ = input_width;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = (gint) ((((gdouble) (_tmp46_ - _tmp47_)) * _tmp48_) / _tmp49_);
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp50_ = input_width;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp51_ = old_scan_line;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp52_ = output_width;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp53_ = input_width;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = (gint) (((((gdouble) (_tmp50_ - _tmp51_)) * _tmp52_) / _tmp53_) + 0.5);
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				T = 0;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp54_ = output_height;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = _tmp54_ - 1;
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 3042 "page-view.c"
-			}
-			default:
-			{
-				gint _tmp55_ = 0;
-				gint _tmp56_ = 0;
-				gint _tmp57_ = 0;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				T = 0;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp55_ = T;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = _tmp55_;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp56_ = B;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = _tmp56_;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp57_ = R;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = _tmp57_;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 3065 "page-view.c"
-			}
-		}
-	}
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp58_ = R;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp59_ = output_width;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp58_ >= _tmp59_) {
-#line 3075 "page-view.c"
-		gint _tmp60_ = 0;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp60_ = output_width;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		R = _tmp60_ - 1;
-#line 3081 "page-view.c"
-	}
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp61_ = B;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp62_ = output_height;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp61_ >= _tmp62_) {
-#line 3089 "page-view.c"
-		gint _tmp63_ = 0;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp63_ = output_height;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		B = _tmp63_ - 1;
-#line 3095 "page-view.c"
-	}
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp64_ = L;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp64_ >= 0);
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp65_ = R;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp66_ = output_width;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp65_ < _tmp66_);
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp67_ = T;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp67_ >= 0);
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp68_ = B;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp69_ = output_height;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp68_ < _tmp69_);
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp70_ = *output_image;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp70_ != NULL);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp71_ = *output_image;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp72_ = gdk_pixbuf_get_pixels (_tmp71_);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output = _tmp72_;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output_length1 = -1;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_output_size_ = output_length1;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp73_ = *output_image;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp74_ = gdk_pixbuf_get_rowstride (_tmp73_);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp75_ = _tmp74_;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output_rowstride = _tmp75_;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp76_ = *output_image;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp77_ = gdk_pixbuf_get_n_channels (_tmp76_);
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp78_ = _tmp77_;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output_n_channels = _tmp78_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp79_ = page;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp80_ = page_get_has_data (_tmp79_);
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp81_ = _tmp80_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (!_tmp81_) {
-#line 3155 "page-view.c"
-		{
-			gint x = 0;
-			gint _tmp82_ = 0;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp82_ = L;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			x = _tmp82_;
-#line 3163 "page-view.c"
-			{
-				gboolean _tmp83_ = FALSE;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp83_ = TRUE;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				while (TRUE) {
-#line 3170 "page-view.c"
-					gint _tmp85_ = 0;
-					gint _tmp86_ = 0;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!_tmp83_) {
-#line 3175 "page-view.c"
-						gint _tmp84_ = 0;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp84_ = x;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						x = _tmp84_ + 1;
-#line 3181 "page-view.c"
-					}
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp83_ = FALSE;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp85_ = x;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp86_ = R;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!(_tmp85_ <= _tmp86_)) {
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						break;
-#line 3193 "page-view.c"
-					}
-					{
-						gint y = 0;
-						gint _tmp87_ = 0;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp87_ = T;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						y = _tmp87_;
-#line 3202 "page-view.c"
-						{
-							gboolean _tmp88_ = FALSE;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp88_ = TRUE;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							while (TRUE) {
-#line 3209 "page-view.c"
-								gint _tmp90_ = 0;
-								gint _tmp91_ = 0;
-								gint o = 0;
-								gint _tmp92_ = 0;
-								gint _tmp93_ = 0;
-								gint _tmp94_ = 0;
-								gint _tmp95_ = 0;
-								guchar* _tmp96_ = NULL;
-								gint _tmp96__length1 = 0;
-								gint _tmp97_ = 0;
-								guchar* _tmp98_ = NULL;
-								gint _tmp98__length1 = 0;
-								gint _tmp99_ = 0;
-								guchar* _tmp100_ = NULL;
-								gint _tmp100__length1 = 0;
-								gint _tmp101_ = 0;
-								guchar _tmp102_ = '\0';
-								guchar _tmp103_ = '\0';
-								guchar _tmp104_ = '\0';
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								if (!_tmp88_) {
-#line 3231 "page-view.c"
-									gint _tmp89_ = 0;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-									_tmp89_ = y;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-									y = _tmp89_ + 1;
-#line 3237 "page-view.c"
-								}
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp88_ = FALSE;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp90_ = y;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp91_ = B;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								if (!(_tmp90_ <= _tmp91_)) {
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-									break;
-#line 3249 "page-view.c"
-								}
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp92_ = output_rowstride;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp93_ = y;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp94_ = x;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp95_ = output_n_channels;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								o = (_tmp92_ * _tmp93_) + (_tmp94_ * _tmp95_);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp96_ = output;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp96__length1 = output_length1;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp97_ = o;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp98_ = output;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp98__length1 = output_length1;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp99_ = o;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp100_ = output;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp100__length1 = output_length1;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp101_ = o;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp100_[_tmp101_ + 2] = (guchar) 0xFF;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp102_ = _tmp100_[_tmp101_ + 2];
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp98_[_tmp99_ + 1] = _tmp102_;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp103_ = _tmp98_[_tmp99_ + 1];
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp96_[_tmp97_] = _tmp103_;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp104_ = _tmp96_[_tmp97_];
-#line 3291 "page-view.c"
-							}
-						}
-					}
-				}
-			}
-		}
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 3300 "page-view.c"
-	}
-	{
-		gint x = 0;
-		gint _tmp105_ = 0;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp105_ = L;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp105_;
-#line 3309 "page-view.c"
-		{
-			gboolean _tmp106_ = FALSE;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp106_ = TRUE;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			while (TRUE) {
-#line 3316 "page-view.c"
-				gint _tmp108_ = 0;
-				gint _tmp109_ = 0;
-				gdouble l = 0.0;
-				gint _tmp110_ = 0;
-				gint _tmp111_ = 0;
-				gint _tmp112_ = 0;
-				gdouble r = 0.0;
-				gint _tmp113_ = 0;
-				gint _tmp114_ = 0;
-				gint _tmp115_ = 0;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!_tmp106_) {
-#line 3329 "page-view.c"
-					gint _tmp107_ = 0;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp107_ = x;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = _tmp107_ + 1;
-#line 3335 "page-view.c"
-				}
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp106_ = FALSE;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp108_ = x;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp109_ = R;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!(_tmp108_ <= _tmp109_)) {
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					break;
-#line 3347 "page-view.c"
-				}
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp110_ = x;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp111_ = input_width;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp112_ = output_width;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				l = (((gdouble) _tmp110_) * _tmp111_) / _tmp112_;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp113_ = x;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp114_ = input_width;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp115_ = output_width;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				r = (((gdouble) (_tmp113_ + 1)) * _tmp114_) / _tmp115_;
-#line 3365 "page-view.c"
-				{
-					gint y = 0;
-					gint _tmp116_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp116_ = T;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = _tmp116_;
-#line 3373 "page-view.c"
-					{
-						gboolean _tmp117_ = FALSE;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp117_ = TRUE;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						while (TRUE) {
-#line 3380 "page-view.c"
-							gint _tmp119_ = 0;
-							gint _tmp120_ = 0;
-							gdouble t = 0.0;
-							gint _tmp121_ = 0;
-							gint _tmp122_ = 0;
-							gint _tmp123_ = 0;
-							gdouble b = 0.0;
-							gint _tmp124_ = 0;
-							gint _tmp125_ = 0;
-							gint _tmp126_ = 0;
-							Page* _tmp127_ = NULL;
-							gdouble _tmp128_ = 0.0;
-							gdouble _tmp129_ = 0.0;
-							gdouble _tmp130_ = 0.0;
-							gdouble _tmp131_ = 0.0;
-							guchar* _tmp132_ = NULL;
-							gint _tmp132__length1 = 0;
-							gint _tmp133_ = 0;
-							gint _tmp134_ = 0;
-							gint _tmp135_ = 0;
-							gint _tmp136_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!_tmp117_) {
-#line 3404 "page-view.c"
-								gint _tmp118_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp118_ = y;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								y = _tmp118_ + 1;
-#line 3410 "page-view.c"
-							}
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp117_ = FALSE;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp119_ = y;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp120_ = B;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!(_tmp119_ <= _tmp120_)) {
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								break;
-#line 3422 "page-view.c"
-							}
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp121_ = y;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp122_ = input_height;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp123_ = output_height;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							t = (((gdouble) _tmp121_) * _tmp122_) / _tmp123_;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp124_ = y;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp125_ = input_height;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp126_ = output_height;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							b = (((gdouble) (_tmp124_ + 1)) * _tmp125_) / _tmp126_;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp127_ = page;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp128_ = l;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp129_ = r;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp130_ = t;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp131_ = b;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp132_ = output;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp132__length1 = output_length1;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp133_ = output_rowstride;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp134_ = y;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp135_ = x;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp136_ = output_n_channels;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							page_view_set_pixel (self, _tmp127_, _tmp128_, _tmp129_, _tmp130_, _tmp131_, _tmp132_, _tmp132__length1, (_tmp133_ * _tmp134_) + (_tmp135_ * _tmp136_));
-#line 3464 "page-view.c"
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-
-static gint page_view_get_preview_width (PageView* self) {
-	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->width_;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->border_width;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_ - (_tmp1_ * 2);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 3488 "page-view.c"
-}
-
-
-static gint page_view_get_preview_height (PageView* self) {
-	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->height_;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->border_width;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_ - (_tmp1_ * 2);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 3506 "page-view.c"
-}
-
-
-static void page_view_update_page_view (PageView* self) {
-	gboolean _tmp0_ = FALSE;
-	gint old_scan_line = 0;
-	gint _tmp1_ = 0;
-	gint scan_line = 0;
-	Page* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	ScanDirection left_steps = 0;
-	ScanDirection _tmp5_ = 0;
-	Page* _tmp6_ = NULL;
-	ScanDirection _tmp7_ = 0;
-	ScanDirection _tmp8_ = 0;
-	gboolean _tmp9_ = FALSE;
-	ScanDirection _tmp10_ = 0;
-	Page* _tmp12_ = NULL;
-	ScanDirection _tmp13_ = 0;
-	ScanDirection _tmp14_ = 0;
-	Page* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	Page* _tmp18_ = NULL;
-	ScanDirection _tmp19_ = 0;
-	ScanDirection _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->update_image;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (!_tmp0_) {
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 3545 "page-view.c"
-	}
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->scan_line;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	old_scan_line = _tmp1_;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->_page;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = page_get_scan_line (_tmp2_);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = _tmp3_;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	scan_line = _tmp4_;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = self->priv->scan_direction;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = self->priv->_page;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = page_get_scan_direction (_tmp6_);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = _tmp7_;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	left_steps = _tmp5_ - _tmp8_;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = left_steps;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp10_ != 0) {
-#line 3573 "page-view.c"
-		GdkPixbuf* _tmp11_ = NULL;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = self->priv->image;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp9_ = _tmp11_ != NULL;
-#line 3579 "page-view.c"
-	} else {
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp9_ = FALSE;
-#line 3583 "page-view.c"
-	}
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp9_) {
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_object_unref0 (self->priv->image);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->image = NULL;
-#line 3591 "page-view.c"
-	}
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = self->priv->_page;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = page_get_scan_direction (_tmp12_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = _tmp13_;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->scan_direction = _tmp14_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp15_ = self->priv->_page;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp16_ = page_view_get_preview_width (self);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp17_ = page_view_get_preview_height (self);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = self->priv->_page;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp19_ = page_get_scan_direction (_tmp18_);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp20_ = _tmp19_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp21_ = old_scan_line;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp22_ = scan_line;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_update_preview (self, _tmp15_, &self->priv->image, _tmp16_, _tmp17_, _tmp20_, _tmp21_, _tmp22_);
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->update_image = FALSE;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp23_ = scan_line;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->scan_line = _tmp23_;
-#line 3625 "page-view.c"
-}
-
-
-static gint page_view_page_to_screen_x (PageView* self, gint x) {
-	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	Page* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = x;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = page_view_get_preview_width (self);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->_page;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = page_get_width (_tmp2_);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = _tmp3_;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp4_) + 0.5);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 3652 "page-view.c"
-}
-
-
-static gint page_view_page_to_screen_y (PageView* self, gint y) {
-	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	Page* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = y;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = page_view_get_preview_height (self);
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->_page;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = page_get_height (_tmp2_);
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = _tmp3_;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp4_) + 0.5);
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 3679 "page-view.c"
-}
-
-
-static gint page_view_screen_to_page_x (PageView* self, gint x) {
-	gint result = 0;
-	gint _tmp0_ = 0;
-	Page* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = x;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->_page;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_get_width (_tmp1_);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = _tmp2_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = page_view_get_preview_width (self);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (gint) (((((gdouble) _tmp0_) * _tmp3_) / _tmp4_) + 0.5);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 3706 "page-view.c"
-}
-
-
-static gint page_view_screen_to_page_y (PageView* self, gint y) {
-	gint result = 0;
-	gint _tmp0_ = 0;
-	Page* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = y;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->_page;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_get_height (_tmp1_);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = _tmp2_;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = page_view_get_preview_height (self);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (gint) (((((gdouble) _tmp0_) * _tmp3_) / _tmp4_) + 0.5);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 3733 "page-view.c"
-}
-
-
-static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y) {
-	CropLocation result = 0;
-	Page* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gint cx = 0;
-	Page* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint cy = 0;
-	Page* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint cw = 0;
-	Page* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gint ch = 0;
-	Page* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint dx = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	gint dy = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint dw = 0;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	gint dh = 0;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	gint ix = 0;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gint iy = 0;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	gboolean _tmp27_ = FALSE;
-	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
-	gint _tmp30_ = 0;
-	gchar* name = NULL;
-	Page* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
-	const gchar* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	const gchar* _tmp40_ = NULL;
-	gint crop_border = 0;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	gint _tmp44_ = 0;
-	gint _tmp45_ = 0;
-	gboolean _tmp47_ = FALSE;
-	gint _tmp48_ = 0;
-	gint _tmp49_ = 0;
-	gboolean _tmp52_ = FALSE;
-	gint _tmp53_ = 0;
-	gint _tmp54_ = 0;
-	gint _tmp55_ = 0;
-	gboolean _tmp58_ = FALSE;
-	gint _tmp59_ = 0;
-	gint _tmp60_ = 0;
-	gboolean _tmp64_ = FALSE;
-	gint _tmp65_ = 0;
-	gint _tmp66_ = 0;
-	gint _tmp67_ = 0;
-	gint _tmp71_ = 0;
-	gint _tmp72_ = 0;
-	gint _tmp73_ = 0;
-	gint _tmp74_ = 0;
-	gint _tmp75_ = 0;
-	gint _tmp76_ = 0;
-	gint _tmp77_ = 0;
-	gint _tmp78_ = 0;
-	gint _tmp79_ = 0;
-	gint _tmp80_ = 0;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->_page;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = page_get_has_crop (_tmp0_);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = _tmp1_;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (!_tmp2_) {
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = 0;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 3829 "page-view.c"
-	}
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = self->priv->_page;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = page_get_crop_x (_tmp3_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = _tmp4_;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cx = _tmp5_;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = self->priv->_page;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = page_get_crop_y (_tmp6_);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = _tmp7_;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cy = _tmp8_;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = self->priv->_page;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = page_get_crop_width (_tmp9_);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp11_ = _tmp10_;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cw = _tmp11_;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = self->priv->_page;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = page_get_crop_height (_tmp12_);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = _tmp13_;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	ch = _tmp14_;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp15_ = cx;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp16_ = page_view_page_to_screen_x (self, _tmp15_);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dx = _tmp16_;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp17_ = cy;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = page_view_page_to_screen_y (self, _tmp17_);
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dy = _tmp18_;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp19_ = cw;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp20_ = page_view_page_to_screen_x (self, _tmp19_);
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dw = _tmp20_;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp21_ = ch;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp22_ = page_view_page_to_screen_y (self, _tmp21_);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dh = _tmp22_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp23_ = x;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp24_ = dx;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	ix = _tmp23_ - _tmp24_;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp25_ = y;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp26_ = dy;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	iy = _tmp25_ - _tmp26_;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp30_ = ix;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp30_ < 0) {
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = TRUE;
-#line 3905 "page-view.c"
-	} else {
-		gint _tmp31_ = 0;
-		gint _tmp32_ = 0;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp31_ = ix;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp32_ = dw;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = _tmp31_ > _tmp32_;
-#line 3915 "page-view.c"
-	}
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp29_) {
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp28_ = TRUE;
-#line 3921 "page-view.c"
-	} else {
-		gint _tmp33_ = 0;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp33_ = iy;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp28_ = _tmp33_ < 0;
-#line 3928 "page-view.c"
-	}
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp28_) {
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp27_ = TRUE;
-#line 3934 "page-view.c"
-	} else {
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp34_ = iy;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp35_ = dh;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp27_ = _tmp34_ > _tmp35_;
-#line 3944 "page-view.c"
-	}
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp27_) {
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_NONE;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 3952 "page-view.c"
-	}
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp36_ = self->priv->_page;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp37_ = page_get_crop_name (_tmp36_);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp38_ = _tmp37_;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp39_ = g_strdup (_tmp38_);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	name = _tmp39_;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp40_ = name;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp40_ != NULL) {
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_MIDDLE;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_free0 (name);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 3974 "page-view.c"
-	}
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	crop_border = 20;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp41_ = dw;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp42_ = crop_border;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp41_ < (_tmp42_ * 3)) {
-#line 3984 "page-view.c"
-		gint _tmp43_ = 0;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = dw;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_border = _tmp43_ / 3;
-#line 3990 "page-view.c"
-	}
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp44_ = dh;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp45_ = crop_border;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp44_ < (_tmp45_ * 3)) {
-#line 3998 "page-view.c"
-		gint _tmp46_ = 0;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = dh;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_border = _tmp46_ / 3;
-#line 4004 "page-view.c"
-	}
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp48_ = ix;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp49_ = crop_border;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp48_ < _tmp49_) {
-#line 4012 "page-view.c"
-		gint _tmp50_ = 0;
-		gint _tmp51_ = 0;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp50_ = iy;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp51_ = crop_border;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp47_ = _tmp50_ < _tmp51_;
-#line 4021 "page-view.c"
-	} else {
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp47_ = FALSE;
-#line 4025 "page-view.c"
-	}
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp47_) {
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_TOP_LEFT;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_free0 (name);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 4035 "page-view.c"
-	}
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp53_ = ix;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp54_ = dw;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp55_ = crop_border;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp53_ > (_tmp54_ - _tmp55_)) {
-#line 4045 "page-view.c"
-		gint _tmp56_ = 0;
-		gint _tmp57_ = 0;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = iy;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp57_ = crop_border;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp52_ = _tmp56_ < _tmp57_;
-#line 4054 "page-view.c"
-	} else {
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp52_ = FALSE;
-#line 4058 "page-view.c"
-	}
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp52_) {
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_TOP_RIGHT;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_free0 (name);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 4068 "page-view.c"
-	}
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp59_ = ix;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp60_ = crop_border;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp59_ < _tmp60_) {
-#line 4076 "page-view.c"
-		gint _tmp61_ = 0;
-		gint _tmp62_ = 0;
-		gint _tmp63_ = 0;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp61_ = iy;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp62_ = dh;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp63_ = crop_border;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp58_ = _tmp61_ > (_tmp62_ - _tmp63_);
-#line 4088 "page-view.c"
-	} else {
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp58_ = FALSE;
-#line 4092 "page-view.c"
-	}
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp58_) {
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_BOTTOM_LEFT;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_free0 (name);
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 4102 "page-view.c"
-	}
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp65_ = ix;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp66_ = dw;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp67_ = crop_border;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp65_ > (_tmp66_ - _tmp67_)) {
-#line 4112 "page-view.c"
-		gint _tmp68_ = 0;
-		gint _tmp69_ = 0;
-		gint _tmp70_ = 0;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp68_ = iy;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp69_ = dh;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp70_ = crop_border;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp64_ = _tmp68_ > (_tmp69_ - _tmp70_);
-#line 4124 "page-view.c"
-	} else {
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp64_ = FALSE;
-#line 4128 "page-view.c"
-	}
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp64_) {
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_BOTTOM_RIGHT;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_free0 (name);
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 4138 "page-view.c"
-	}
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp71_ = ix;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp72_ = crop_border;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp71_ < _tmp72_) {
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_LEFT;
-#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 4152 "page-view.c"
-	}
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp73_ = ix;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp74_ = dw;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp75_ = crop_border;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp73_ > (_tmp74_ - _tmp75_)) {
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_RIGHT;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_free0 (name);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 4168 "page-view.c"
-	}
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp76_ = iy;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp77_ = crop_border;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp76_ < _tmp77_) {
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_TOP;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_free0 (name);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 4182 "page-view.c"
-	}
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp78_ = iy;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp79_ = dh;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp80_ = crop_border;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp78_ > (_tmp79_ - _tmp80_)) {
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		result = CROP_LOCATION_BOTTOM;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_g_free0 (name);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return result;
-#line 4198 "page-view.c"
-	}
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = CROP_LOCATION_MIDDLE;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_g_free0 (name);
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 4206 "page-view.c"
-}
-
-
-void page_view_button_press (PageView* self, gint x, gint y) {
-	CropLocation location = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	CropLocation _tmp2_ = 0;
-	CropLocation _tmp3_ = 0;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = x;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = y;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_view_get_crop_location (self, _tmp0_, _tmp1_);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	location = _tmp2_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = location;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp3_ != CROP_LOCATION_NONE) {
-#line 4230 "page-view.c"
-		CropLocation _tmp4_ = 0;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		Page* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		Page* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		Page* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		Page* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp4_ = location;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->crop_location = _tmp4_;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = x;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_px = (gdouble) _tmp5_;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp6_ = y;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_py = (gdouble) _tmp6_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = self->priv->_page;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp8_ = page_get_crop_x (_tmp7_);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp9_ = _tmp8_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_x = _tmp9_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = self->priv->_page;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = page_get_crop_y (_tmp10_);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp12_ = _tmp11_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_y = _tmp12_;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp13_ = self->priv->_page;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp14_ = page_get_crop_width (_tmp13_);
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp15_ = _tmp14_;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_w = _tmp15_;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp16_ = self->priv->_page;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp17_ = page_get_crop_height (_tmp16_);
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp18_ = _tmp17_;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_h = _tmp18_;
-#line 4290 "page-view.c"
-	}
-}
-
-
-void page_view_motion (PageView* self, gint x, gint y) {
-	CropLocation location = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	CropLocation _tmp2_ = 0;
-	GdkCursorType cursor = 0;
-	CropLocation _tmp3_ = 0;
-	CropLocation _tmp4_ = 0;
-	gint pw = 0;
-	Page* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint ph = 0;
-	Page* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gint cw = 0;
-	Page* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint ch = 0;
-	Page* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint dx = 0;
-	gint _tmp18_ = 0;
-	gdouble _tmp19_ = 0.0;
-	gint _tmp20_ = 0;
-	gint dy = 0;
-	gint _tmp21_ = 0;
-	gdouble _tmp22_ = 0.0;
-	gint _tmp23_ = 0;
-	gint new_x = 0;
-	gint _tmp24_ = 0;
-	gint new_y = 0;
-	gint _tmp25_ = 0;
-	gint new_w = 0;
-	gint _tmp26_ = 0;
-	gint new_h = 0;
-	gint _tmp27_ = 0;
-	gint min_size = 0;
-	gint _tmp28_ = 0;
-	gboolean _tmp29_ = FALSE;
-	gboolean _tmp30_ = FALSE;
-	CropLocation _tmp31_ = 0;
-	gboolean _tmp42_ = FALSE;
-	gboolean _tmp43_ = FALSE;
-	CropLocation _tmp44_ = 0;
-	gboolean _tmp55_ = FALSE;
-	gboolean _tmp56_ = FALSE;
-	CropLocation _tmp57_ = 0;
-	gboolean _tmp72_ = FALSE;
-	gboolean _tmp73_ = FALSE;
-	CropLocation _tmp74_ = 0;
-	CropLocation _tmp89_ = 0;
-	CropLocation _tmp110_ = 0;
-	gboolean _tmp115_ = FALSE;
-	gboolean _tmp116_ = FALSE;
-	CropLocation _tmp117_ = 0;
-	gboolean _tmp124_ = FALSE;
-	gboolean _tmp125_ = FALSE;
-	CropLocation _tmp126_ = 0;
-	gboolean _tmp133_ = FALSE;
-	gboolean _tmp134_ = FALSE;
-	CropLocation _tmp135_ = 0;
-	gboolean _tmp140_ = FALSE;
-	gboolean _tmp141_ = FALSE;
-	CropLocation _tmp142_ = 0;
-	Page* _tmp147_ = NULL;
-	gint _tmp148_ = 0;
-	gint _tmp149_ = 0;
-	gboolean _tmp150_ = FALSE;
-	gint _tmp151_ = 0;
-	gint _tmp152_ = 0;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = x;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = y;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_view_get_crop_location (self, _tmp0_, _tmp1_);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	location = _tmp2_;
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = location;
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	switch (_tmp3_) {
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case CROP_LOCATION_MIDDLE:
-#line 4385 "page-view.c"
-		{
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_HAND1;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4391 "page-view.c"
-		}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case CROP_LOCATION_TOP:
-#line 4395 "page-view.c"
-		{
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_TOP_SIDE;
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4401 "page-view.c"
-		}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case CROP_LOCATION_BOTTOM:
-#line 4405 "page-view.c"
-		{
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_BOTTOM_SIDE;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4411 "page-view.c"
-		}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case CROP_LOCATION_LEFT:
-#line 4415 "page-view.c"
-		{
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_LEFT_SIDE;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4421 "page-view.c"
-		}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case CROP_LOCATION_RIGHT:
-#line 4425 "page-view.c"
-		{
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_RIGHT_SIDE;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4431 "page-view.c"
-		}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case CROP_LOCATION_TOP_LEFT:
-#line 4435 "page-view.c"
-		{
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_TOP_LEFT_CORNER;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4441 "page-view.c"
-		}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case CROP_LOCATION_TOP_RIGHT:
-#line 4445 "page-view.c"
-		{
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_TOP_RIGHT_CORNER;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4451 "page-view.c"
-		}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case CROP_LOCATION_BOTTOM_LEFT:
-#line 4455 "page-view.c"
-		{
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_BOTTOM_LEFT_CORNER;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4461 "page-view.c"
-		}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case CROP_LOCATION_BOTTOM_RIGHT:
-#line 4465 "page-view.c"
-		{
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_BOTTOM_RIGHT_CORNER;
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4471 "page-view.c"
-		}
-		default:
-		{
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			cursor = GDK_ARROW;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 4479 "page-view.c"
-		}
-	}
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->crop_location;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp4_ == CROP_LOCATION_NONE) {
-#line 4486 "page-view.c"
-		GdkCursorType _tmp5_ = 0;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = cursor;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_view_set_cursor (self, _tmp5_);
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 4494 "page-view.c"
-	}
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = self->priv->_page;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = page_get_width (_tmp6_);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = _tmp7_;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	pw = _tmp8_;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = self->priv->_page;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = page_get_height (_tmp9_);
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp11_ = _tmp10_;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	ph = _tmp11_;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = self->priv->_page;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = page_get_crop_width (_tmp12_);
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = _tmp13_;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cw = _tmp14_;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp15_ = self->priv->_page;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp16_ = page_get_crop_height (_tmp15_);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp17_ = _tmp16_;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	ch = _tmp17_;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = x;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp19_ = self->priv->selected_crop_px;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp20_ = page_view_screen_to_page_x (self, _tmp18_ - ((gint) _tmp19_));
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dx = _tmp20_;
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp21_ = y;
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp22_ = self->priv->selected_crop_py;
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp23_ = page_view_screen_to_page_y (self, _tmp21_ - ((gint) _tmp22_));
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dy = _tmp23_;
-#line 693 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp24_ = self->priv->selected_crop_x;
-#line 693 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	new_x = _tmp24_;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp25_ = self->priv->selected_crop_y;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	new_y = _tmp25_;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp26_ = self->priv->selected_crop_w;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	new_w = _tmp26_;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp27_ = self->priv->selected_crop_h;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	new_h = _tmp27_;
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp28_ = page_view_screen_to_page_x (self, 15);
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	min_size = _tmp28_;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp31_ = self->priv->crop_location;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp31_ == CROP_LOCATION_TOP_LEFT) {
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp30_ = TRUE;
-#line 4570 "page-view.c"
-	} else {
-		CropLocation _tmp32_ = 0;
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp32_ = self->priv->crop_location;
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp30_ = _tmp32_ == CROP_LOCATION_LEFT;
-#line 4577 "page-view.c"
-	}
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp30_) {
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = TRUE;
-#line 4583 "page-view.c"
-	} else {
-		CropLocation _tmp33_ = 0;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp33_ = self->priv->crop_location;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = _tmp33_ == CROP_LOCATION_BOTTOM_LEFT;
-#line 4590 "page-view.c"
-	}
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp29_) {
-#line 4594 "page-view.c"
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
-		gint _tmp36_ = 0;
-		gint _tmp39_ = 0;
-		gint _tmp40_ = 0;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp34_ = dx;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp35_ = new_w;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = min_size;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp34_ > (_tmp35_ - _tmp36_)) {
-#line 4608 "page-view.c"
-			gint _tmp37_ = 0;
-			gint _tmp38_ = 0;
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp37_ = new_w;
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp38_ = min_size;
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = _tmp37_ - _tmp38_;
-#line 4617 "page-view.c"
-		}
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp39_ = new_x;
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_ = dx;
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp39_ + _tmp40_) < 0) {
-#line 4625 "page-view.c"
-			gint _tmp41_ = 0;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp41_ = new_x;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = -_tmp41_;
-#line 4631 "page-view.c"
-		}
-	}
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp44_ = self->priv->crop_location;
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp44_ == CROP_LOCATION_TOP_LEFT) {
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = TRUE;
-#line 4640 "page-view.c"
-	} else {
-		CropLocation _tmp45_ = 0;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_ = self->priv->crop_location;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = _tmp45_ == CROP_LOCATION_TOP;
-#line 4647 "page-view.c"
-	}
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp43_) {
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = TRUE;
-#line 4653 "page-view.c"
-	} else {
-		CropLocation _tmp46_ = 0;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = self->priv->crop_location;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = _tmp46_ == CROP_LOCATION_TOP_RIGHT;
-#line 4660 "page-view.c"
-	}
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp42_) {
-#line 4664 "page-view.c"
-		gint _tmp47_ = 0;
-		gint _tmp48_ = 0;
-		gint _tmp49_ = 0;
-		gint _tmp52_ = 0;
-		gint _tmp53_ = 0;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp47_ = dy;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp48_ = new_h;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp49_ = min_size;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp47_ > (_tmp48_ - _tmp49_)) {
-#line 4678 "page-view.c"
-			gint _tmp50_ = 0;
-			gint _tmp51_ = 0;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp50_ = new_h;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp51_ = min_size;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = _tmp50_ - _tmp51_;
-#line 4687 "page-view.c"
-		}
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp52_ = new_y;
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_ = dy;
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp52_ + _tmp53_) < 0) {
-#line 4695 "page-view.c"
-			gint _tmp54_ = 0;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp54_ = new_y;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = -_tmp54_;
-#line 4701 "page-view.c"
-		}
-	}
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp57_ = self->priv->crop_location;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp57_ == CROP_LOCATION_TOP_RIGHT) {
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = TRUE;
-#line 4710 "page-view.c"
-	} else {
-		CropLocation _tmp58_ = 0;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp58_ = self->priv->crop_location;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = _tmp58_ == CROP_LOCATION_RIGHT;
-#line 4717 "page-view.c"
-	}
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp56_) {
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp55_ = TRUE;
-#line 4723 "page-view.c"
-	} else {
-		CropLocation _tmp59_ = 0;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp59_ = self->priv->crop_location;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp55_ = _tmp59_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 4730 "page-view.c"
-	}
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp55_) {
-#line 4734 "page-view.c"
-		gint _tmp60_ = 0;
-		gint _tmp61_ = 0;
-		gint _tmp62_ = 0;
-		gint _tmp65_ = 0;
-		gint _tmp66_ = 0;
-		gint _tmp67_ = 0;
-		gint _tmp68_ = 0;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp60_ = dx;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp61_ = min_size;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp62_ = new_w;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp60_ < (_tmp61_ - _tmp62_)) {
-#line 4750 "page-view.c"
-			gint _tmp63_ = 0;
-			gint _tmp64_ = 0;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp63_ = min_size;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp64_ = new_w;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = _tmp63_ - _tmp64_;
-#line 4759 "page-view.c"
-		}
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp65_ = new_x;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp66_ = new_w;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp67_ = dx;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp68_ = pw;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp65_ + _tmp66_) + _tmp67_) > _tmp68_) {
-#line 4771 "page-view.c"
-			gint _tmp69_ = 0;
-			gint _tmp70_ = 0;
-			gint _tmp71_ = 0;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp69_ = pw;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp70_ = new_x;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp71_ = new_w;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = (_tmp69_ - _tmp70_) - _tmp71_;
-#line 4783 "page-view.c"
-		}
-	}
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp74_ = self->priv->crop_location;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp74_ == CROP_LOCATION_BOTTOM_LEFT) {
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp73_ = TRUE;
-#line 4792 "page-view.c"
-	} else {
-		CropLocation _tmp75_ = 0;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp75_ = self->priv->crop_location;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp73_ = _tmp75_ == CROP_LOCATION_BOTTOM;
-#line 4799 "page-view.c"
-	}
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp73_) {
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp72_ = TRUE;
-#line 4805 "page-view.c"
-	} else {
-		CropLocation _tmp76_ = 0;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp76_ = self->priv->crop_location;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp72_ = _tmp76_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 4812 "page-view.c"
-	}
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp72_) {
-#line 4816 "page-view.c"
-		gint _tmp77_ = 0;
-		gint _tmp78_ = 0;
-		gint _tmp79_ = 0;
-		gint _tmp82_ = 0;
-		gint _tmp83_ = 0;
-		gint _tmp84_ = 0;
-		gint _tmp85_ = 0;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp77_ = dy;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp78_ = min_size;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp79_ = new_h;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp77_ < (_tmp78_ - _tmp79_)) {
-#line 4832 "page-view.c"
-			gint _tmp80_ = 0;
-			gint _tmp81_ = 0;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp80_ = min_size;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp81_ = new_h;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = _tmp80_ - _tmp81_;
-#line 4841 "page-view.c"
-		}
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp82_ = new_y;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp83_ = new_h;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp84_ = dy;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp85_ = ph;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp82_ + _tmp83_) + _tmp84_) > _tmp85_) {
-#line 4853 "page-view.c"
-			gint _tmp86_ = 0;
-			gint _tmp87_ = 0;
-			gint _tmp88_ = 0;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp86_ = ph;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp87_ = new_y;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp88_ = new_h;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = (_tmp86_ - _tmp87_) - _tmp88_;
-#line 4865 "page-view.c"
-		}
-	}
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp89_ = self->priv->crop_location;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp89_ == CROP_LOCATION_MIDDLE) {
-#line 4872 "page-view.c"
-		gint _tmp90_ = 0;
-		gint _tmp91_ = 0;
-		gint _tmp92_ = 0;
-		gint _tmp93_ = 0;
-		gint _tmp97_ = 0;
-		gint _tmp98_ = 0;
-		gint _tmp100_ = 0;
-		gint _tmp101_ = 0;
-		gint _tmp102_ = 0;
-		gint _tmp103_ = 0;
-		gint _tmp107_ = 0;
-		gint _tmp108_ = 0;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp90_ = new_x;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp91_ = dx;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp92_ = new_w;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp93_ = pw;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp90_ + _tmp91_) + _tmp92_) > _tmp93_) {
-#line 4895 "page-view.c"
-			gint _tmp94_ = 0;
-			gint _tmp95_ = 0;
-			gint _tmp96_ = 0;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp94_ = pw;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp95_ = new_x;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp96_ = new_w;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = (_tmp94_ - _tmp95_) - _tmp96_;
-#line 4907 "page-view.c"
-		}
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp97_ = new_x;
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp98_ = dx;
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp97_ + _tmp98_) < 0) {
-#line 4915 "page-view.c"
-			gint _tmp99_ = 0;
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp99_ = new_x;
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = -_tmp99_;
-#line 4921 "page-view.c"
-		}
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp100_ = new_y;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp101_ = dy;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp102_ = new_h;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp103_ = ph;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp100_ + _tmp101_) + _tmp102_) > _tmp103_) {
-#line 4933 "page-view.c"
-			gint _tmp104_ = 0;
-			gint _tmp105_ = 0;
-			gint _tmp106_ = 0;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp104_ = ph;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp105_ = new_y;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp106_ = new_h;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = (_tmp104_ - _tmp105_) - _tmp106_;
-#line 4945 "page-view.c"
-		}
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp107_ = new_y;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp108_ = dy;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp107_ + _tmp108_) < 0) {
-#line 4953 "page-view.c"
-			gint _tmp109_ = 0;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp109_ = new_y;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = -_tmp109_;
-#line 4959 "page-view.c"
-		}
-	}
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp110_ = self->priv->crop_location;
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp110_ == CROP_LOCATION_MIDDLE) {
-#line 4966 "page-view.c"
-		gint _tmp111_ = 0;
-		gint _tmp112_ = 0;
-		gint _tmp113_ = 0;
-		gint _tmp114_ = 0;
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp111_ = new_x;
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp112_ = dx;
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_x = _tmp111_ + _tmp112_;
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp113_ = new_y;
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp114_ = dy;
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_y = _tmp113_ + _tmp114_;
-#line 4983 "page-view.c"
-	}
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp117_ = self->priv->crop_location;
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp117_ == CROP_LOCATION_TOP_LEFT) {
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp116_ = TRUE;
-#line 4991 "page-view.c"
-	} else {
-		CropLocation _tmp118_ = 0;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp118_ = self->priv->crop_location;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp116_ = _tmp118_ == CROP_LOCATION_LEFT;
-#line 4998 "page-view.c"
-	}
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp116_) {
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp115_ = TRUE;
-#line 5004 "page-view.c"
-	} else {
-		CropLocation _tmp119_ = 0;
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp119_ = self->priv->crop_location;
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp115_ = _tmp119_ == CROP_LOCATION_BOTTOM_LEFT;
-#line 5011 "page-view.c"
-	}
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp115_) {
-#line 5015 "page-view.c"
-		gint _tmp120_ = 0;
-		gint _tmp121_ = 0;
-		gint _tmp122_ = 0;
-		gint _tmp123_ = 0;
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp120_ = new_x;
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp121_ = dx;
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_x = _tmp120_ + _tmp121_;
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp122_ = new_w;
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp123_ = dx;
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_w = _tmp122_ - _tmp123_;
-#line 5032 "page-view.c"
-	}
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp126_ = self->priv->crop_location;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp126_ == CROP_LOCATION_TOP_LEFT) {
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp125_ = TRUE;
-#line 5040 "page-view.c"
-	} else {
-		CropLocation _tmp127_ = 0;
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp127_ = self->priv->crop_location;
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp125_ = _tmp127_ == CROP_LOCATION_TOP;
-#line 5047 "page-view.c"
-	}
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp125_) {
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp124_ = TRUE;
-#line 5053 "page-view.c"
-	} else {
-		CropLocation _tmp128_ = 0;
-#line 764 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp128_ = self->priv->crop_location;
-#line 764 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp124_ = _tmp128_ == CROP_LOCATION_TOP_RIGHT;
-#line 5060 "page-view.c"
-	}
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp124_) {
-#line 5064 "page-view.c"
-		gint _tmp129_ = 0;
-		gint _tmp130_ = 0;
-		gint _tmp131_ = 0;
-		gint _tmp132_ = 0;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp129_ = new_y;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp130_ = dy;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_y = _tmp129_ + _tmp130_;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp131_ = new_h;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp132_ = dy;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_h = _tmp131_ - _tmp132_;
-#line 5081 "page-view.c"
-	}
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp135_ = self->priv->crop_location;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp135_ == CROP_LOCATION_TOP_RIGHT) {
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp134_ = TRUE;
-#line 5089 "page-view.c"
-	} else {
-		CropLocation _tmp136_ = 0;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp136_ = self->priv->crop_location;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp134_ = _tmp136_ == CROP_LOCATION_RIGHT;
-#line 5096 "page-view.c"
-	}
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp134_) {
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp133_ = TRUE;
-#line 5102 "page-view.c"
-	} else {
-		CropLocation _tmp137_ = 0;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp137_ = self->priv->crop_location;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp133_ = _tmp137_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 5109 "page-view.c"
-	}
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp133_) {
-#line 5113 "page-view.c"
-		gint _tmp138_ = 0;
-		gint _tmp139_ = 0;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp138_ = new_w;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp139_ = dx;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_w = _tmp138_ + _tmp139_;
-#line 5122 "page-view.c"
-	}
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp142_ = self->priv->crop_location;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp142_ == CROP_LOCATION_BOTTOM_LEFT) {
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp141_ = TRUE;
-#line 5130 "page-view.c"
-	} else {
-		CropLocation _tmp143_ = 0;
-#line 775 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp143_ = self->priv->crop_location;
-#line 775 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp141_ = _tmp143_ == CROP_LOCATION_BOTTOM;
-#line 5137 "page-view.c"
-	}
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp141_) {
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp140_ = TRUE;
-#line 5143 "page-view.c"
-	} else {
-		CropLocation _tmp144_ = 0;
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp144_ = self->priv->crop_location;
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp140_ = _tmp144_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 5150 "page-view.c"
-	}
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp140_) {
-#line 5154 "page-view.c"
-		gint _tmp145_ = 0;
-		gint _tmp146_ = 0;
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp145_ = new_h;
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp146_ = dy;
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_h = _tmp145_ + _tmp146_;
-#line 5163 "page-view.c"
-	}
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp147_ = self->priv->_page;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp148_ = new_x;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp149_ = new_y;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_move_crop (_tmp147_, _tmp148_, _tmp149_);
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp151_ = new_w;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp152_ = cw;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp151_ != _tmp152_) {
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp150_ = TRUE;
-#line 5181 "page-view.c"
-	} else {
-		gint _tmp153_ = 0;
-		gint _tmp154_ = 0;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp153_ = new_h;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp154_ = ch;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp150_ = _tmp153_ != _tmp154_;
-#line 5191 "page-view.c"
-	}
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp150_) {
-#line 5195 "page-view.c"
-		Page* _tmp155_ = NULL;
-		gint _tmp156_ = 0;
-		gint _tmp157_ = 0;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp155_ = self->priv->_page;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp156_ = new_w;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp157_ = new_h;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_set_custom_crop (_tmp155_, _tmp156_, _tmp157_);
-#line 5207 "page-view.c"
-	}
-}
-
-
-void page_view_button_release (PageView* self, gint x, gint y) {
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->crop_location = CROP_LOCATION_NONE;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 5219 "page-view.c"
-}
-
-
-static gboolean page_view_animation_cb (PageView* self) {
-	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 795 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->animate_segment;
-#line 795 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->animate_n_segments;
-#line 795 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->animate_segment = (_tmp0_ + 1) % _tmp1_;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = TRUE;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 5241 "page-view.c"
-}
-
-
-static gboolean _page_view_animation_cb_gsource_func (gpointer self) {
-	gboolean result;
-	result = page_view_animation_cb ((PageView*) self);
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 5250 "page-view.c"
-}
-
-
-static void page_view_update_animation (PageView* self) {
-	gboolean animate = FALSE;
-	gboolean is_animating = FALSE;
-	gboolean _tmp0_ = FALSE;
-	Page* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	guint _tmp7_ = 0U;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_ = FALSE;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->_page;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_get_is_scanning (_tmp1_);
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = _tmp2_;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp3_) {
-#line 5275 "page-view.c"
-		Page* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp4_ = self->priv->_page;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = page_get_has_data (_tmp4_);
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp6_ = _tmp5_;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp0_ = !_tmp6_;
-#line 5287 "page-view.c"
-	} else {
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp0_ = FALSE;
-#line 5291 "page-view.c"
-	}
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	animate = _tmp0_;
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = self->priv->animate_timeout;
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	is_animating = _tmp7_ != ((guint) 0);
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = animate;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = is_animating;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp8_ == _tmp9_) {
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 5307 "page-view.c"
-	}
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = animate;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp10_) {
-#line 5313 "page-view.c"
-		guint _tmp11_ = 0U;
-#line 811 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->animate_segment = 0;
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = self->priv->animate_timeout;
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp11_ == ((guint) 0)) {
-#line 5321 "page-view.c"
-			guint _tmp12_ = 0U;
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 150, _page_view_animation_cb_gsource_func, page_view_ref (self), page_view_unref);
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			self->priv->animate_timeout = _tmp12_;
-#line 5327 "page-view.c"
-		}
-	} else {
-		guint _tmp13_ = 0U;
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp13_ = self->priv->animate_timeout;
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp13_ != ((guint) 0)) {
-#line 5335 "page-view.c"
-			guint _tmp14_ = 0U;
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp14_ = self->priv->animate_timeout;
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			g_source_remove (_tmp14_);
-#line 5341 "page-view.c"
-		}
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->animate_timeout = (guint) 0;
-#line 5345 "page-view.c"
-	}
-}
-
-
-void page_view_render (PageView* self, cairo_t* context) {
-	gint w = 0;
-	gint _tmp0_ = 0;
-	gint h = 0;
-	gint _tmp1_ = 0;
-	cairo_t* _tmp2_ = NULL;
-	cairo_t* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	cairo_t* _tmp6_ = NULL;
-	cairo_t* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	cairo_t* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	cairo_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	cairo_t* _tmp20_ = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
-	cairo_t* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	Page* _tmp24_ = NULL;
-	gboolean _tmp25_ = FALSE;
-	gboolean _tmp26_ = FALSE;
-	gboolean _tmp70_ = FALSE;
-	Page* _tmp71_ = NULL;
-	gboolean _tmp72_ = FALSE;
-	gboolean _tmp73_ = FALSE;
-	Page* _tmp118_ = NULL;
-	gboolean _tmp119_ = FALSE;
-	gboolean _tmp120_ = FALSE;
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (context != NULL);
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_update_animation (self);
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_update_page_view (self);
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = page_view_get_preview_width (self);
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	w = _tmp0_;
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = page_view_get_preview_height (self);
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	h = _tmp1_;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = context;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cairo_set_line_width (_tmp2_, (gdouble) 1);
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = context;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->_x_offset;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = self->priv->_y_offset;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cairo_translate (_tmp3_, (gdouble) _tmp4_, (gdouble) _tmp5_);
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = context;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cairo_set_source_rgb (_tmp6_, (gdouble) 0, (gdouble) 0, (gdouble) 0);
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = context;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = self->priv->border_width;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cairo_set_line_width (_tmp7_, (gdouble) _tmp8_);
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = context;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = self->priv->border_width;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp11_ = self->priv->border_width;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = self->priv->width_;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = self->priv->border_width;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = self->priv->height_;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp15_ = self->priv->border_width;
-#line 837 "/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 841 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp16_ = context;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cairo_stroke (_tmp16_);
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp17_ = context;
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = self->priv->border_width;
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp19_ = self->priv->border_width;
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cairo_translate (_tmp17_, (gdouble) _tmp18_, (gdouble) _tmp19_);
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp20_ = context;
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp21_ = self->priv->image;
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	gdk_cairo_set_source_pixbuf (_tmp20_, _tmp21_, (gdouble) 0, (gdouble) 0);
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp22_ = context;
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cairo_paint (_tmp22_);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp24_ = self->priv->_page;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp25_ = page_get_is_scanning (_tmp24_);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp26_ = _tmp25_;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp26_) {
-#line 5471 "page-view.c"
-		Page* _tmp27_ = NULL;
-		gboolean _tmp28_ = FALSE;
-		gboolean _tmp29_ = FALSE;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp27_ = self->priv->_page;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp28_ = page_get_has_data (_tmp27_);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = _tmp28_;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp23_ = !_tmp29_;
-#line 5483 "page-view.c"
-	} else {
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp23_ = FALSE;
-#line 5487 "page-view.c"
-	}
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp23_) {
-#line 5491 "page-view.c"
-		gdouble outer_radius = 0.0;
-		gint _tmp30_ = 0;
-		gint _tmp31_ = 0;
-		gdouble arc = 0.0;
-		gint _tmp34_ = 0;
-		gdouble x = 0.0;
-		gdouble _tmp35_ = 0.0;
-		gdouble _tmp36_ = 0.0;
-		gdouble _tmp37_ = 0.0;
-		gdouble y = 0.0;
-		gdouble _tmp38_ = 0.0;
-		gdouble _tmp39_ = 0.0;
-		gdouble _tmp40_ = 0.0;
-		gdouble inner_radius = 0.0;
-		gdouble _tmp41_ = 0.0;
-		gdouble _tmp42_ = 0.0;
-		gdouble _tmp43_ = 0.0;
-		gdouble _tmp44_ = 0.0;
-		gdouble _tmp45_ = 0.0;
-		gdouble offset = 0.0;
-#line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp30_ = w;
-#line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp31_ = h;
-#line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp30_ > _tmp31_) {
-#line 5518 "page-view.c"
-			gint _tmp32_ = 0;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp32_ = w;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			outer_radius = 0.15 * _tmp32_;
-#line 5524 "page-view.c"
-		} else {
-			gint _tmp33_ = 0;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp33_ = h;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			outer_radius = 0.15 * _tmp33_;
-#line 5531 "page-view.c"
-		}
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp34_ = self->priv->animate_n_segments;
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		arc = G_PI / _tmp34_;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp35_ = outer_radius;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = arc;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp37_ = sin (_tmp36_);
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp35_ * _tmp37_;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp38_ = outer_radius;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp39_ = arc;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_ = cos (_tmp39_);
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		y = _tmp38_ * (_tmp40_ - 1.0);
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = x;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = x;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = y;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44_ = y;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_ = sqrt ((_tmp41_ * _tmp42_) + (_tmp43_ * _tmp44_));
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		inner_radius = 0.6 * _tmp45_;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		offset = 0.0;
-#line 5567 "page-view.c"
-		{
-			gint i = 0;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			i = 0;
-#line 5572 "page-view.c"
-			{
-				gboolean _tmp46_ = FALSE;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp46_ = TRUE;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				while (TRUE) {
-#line 5579 "page-view.c"
-					gint _tmp50_ = 0;
-					gint _tmp51_ = 0;
-					gint _tmp52_ = 0;
-					gdouble _tmp53_ = 0.0;
-					gdouble _tmp54_ = 0.0;
-					gdouble _tmp55_ = 0.0;
-					gint _tmp56_ = 0;
-					gdouble _tmp57_ = 0.0;
-					gdouble _tmp58_ = 0.0;
-					gdouble _tmp59_ = 0.0;
-					cairo_t* _tmp60_ = NULL;
-					gdouble _tmp61_ = 0.0;
-					gdouble _tmp62_ = 0.0;
-					gdouble _tmp63_ = 0.0;
-					gint _tmp64_ = 0;
-					gint _tmp65_ = 0;
-					cairo_t* _tmp68_ = NULL;
-					cairo_t* _tmp69_ = NULL;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!_tmp46_) {
-#line 5600 "page-view.c"
-						gint _tmp47_ = 0;
-						gdouble _tmp48_ = 0.0;
-						gdouble _tmp49_ = 0.0;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp47_ = i;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						i = _tmp47_ + 1;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp48_ = offset;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp49_ = arc;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						offset = _tmp48_ + (_tmp49_ * 2);
-#line 5614 "page-view.c"
-					}
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp46_ = FALSE;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp50_ = i;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp51_ = self->priv->animate_n_segments;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!(_tmp50_ < _tmp51_)) {
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						break;
-#line 5626 "page-view.c"
-					}
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp52_ = w;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp53_ = outer_radius;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp54_ = offset;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp55_ = sin (_tmp54_);
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = (_tmp52_ / 2) + (_tmp53_ * _tmp55_);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp56_ = h;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp57_ = outer_radius;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp58_ = offset;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp59_ = cos (_tmp58_);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = (_tmp56_ / 2) - (_tmp57_ * _tmp59_);
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp60_ = context;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp61_ = x;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp62_ = y;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp63_ = inner_radius;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					cairo_arc (_tmp60_, _tmp61_, _tmp62_, _tmp63_, (gdouble) 0, 2 * G_PI);
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp64_ = i;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp65_ = self->priv->animate_segment;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (_tmp64_ == _tmp65_) {
-#line 5664 "page-view.c"
-						cairo_t* _tmp66_ = NULL;
-						cairo_t* _tmp67_ = NULL;
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp66_ = context;
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						cairo_set_source_rgb (_tmp66_, 0.75, 0.75, 0.75);
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp67_ = context;
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						cairo_fill_preserve (_tmp67_);
-#line 5675 "page-view.c"
-					}
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp68_ = context;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					cairo_set_source_rgb (_tmp68_, 0.5, 0.5, 0.5);
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp69_ = context;
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					cairo_stroke (_tmp69_);
-#line 5685 "page-view.c"
-				}
-			}
-		}
-	}
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp71_ = self->priv->_page;
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp72_ = page_get_is_scanning (_tmp71_);
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp73_ = _tmp72_;
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp73_) {
-#line 5698 "page-view.c"
-		Page* _tmp74_ = NULL;
-		gint _tmp75_ = 0;
-		gint _tmp76_ = 0;
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp74_ = self->priv->_page;
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp75_ = page_get_scan_line (_tmp74_);
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp76_ = _tmp75_;
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp70_ = _tmp76_ > 0;
-#line 5710 "page-view.c"
-	} else {
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp70_ = FALSE;
-#line 5714 "page-view.c"
-	}
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp70_) {
-#line 5718 "page-view.c"
-		gint scan_line = 0;
-		Page* _tmp77_ = NULL;
-		gint _tmp78_ = 0;
-		gint _tmp79_ = 0;
-		gdouble s = 0.0;
-		gdouble x1 = 0.0;
-		gdouble y1 = 0.0;
-		gdouble x2 = 0.0;
-		gdouble y2 = 0.0;
-		Page* _tmp80_ = NULL;
-		ScanDirection _tmp81_ = 0;
-		ScanDirection _tmp82_ = 0;
-		cairo_t* _tmp110_ = NULL;
-		gdouble _tmp111_ = 0.0;
-		gdouble _tmp112_ = 0.0;
-		cairo_t* _tmp113_ = NULL;
-		gdouble _tmp114_ = 0.0;
-		gdouble _tmp115_ = 0.0;
-		cairo_t* _tmp116_ = NULL;
-		cairo_t* _tmp117_ = NULL;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp77_ = self->priv->_page;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp78_ = page_get_scan_line (_tmp77_);
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp79_ = _tmp78_;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		scan_line = _tmp79_;
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp80_ = self->priv->_page;
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp81_ = page_get_scan_direction (_tmp80_);
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp82_ = _tmp81_;
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		switch (_tmp82_) {
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 5757 "page-view.c"
-			{
-				gint _tmp83_ = 0;
-				gint _tmp84_ = 0;
-				gdouble _tmp85_ = 0.0;
-				gint _tmp86_ = 0;
-				gdouble _tmp87_ = 0.0;
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp83_ = scan_line;
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp84_ = page_view_page_to_screen_y (self, _tmp83_);
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp84_;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = (gdouble) 0;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp85_ = s;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = _tmp85_ + 0.5;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp86_ = w;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = (gdouble) _tmp86_;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp87_ = s;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = _tmp87_ + 0.5;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 5786 "page-view.c"
-			}
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 5790 "page-view.c"
-			{
-				gint _tmp88_ = 0;
-				gint _tmp89_ = 0;
-				gint _tmp90_ = 0;
-				gdouble _tmp91_ = 0.0;
-				gint _tmp92_ = 0;
-				gint _tmp93_ = 0;
-				gdouble _tmp94_ = 0.0;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp88_ = scan_line;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp89_ = page_view_page_to_screen_y (self, _tmp88_);
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp89_;
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = (gdouble) 0;
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp90_ = h;
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp91_ = s;
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = (_tmp90_ - _tmp91_) + 0.5;
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp92_ = w;
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = (gdouble) _tmp92_;
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp93_ = h;
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp94_ = s;
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (_tmp93_ - _tmp94_) + 0.5;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 5825 "page-view.c"
-			}
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 5829 "page-view.c"
-			{
-				gint _tmp95_ = 0;
-				gint _tmp96_ = 0;
-				gdouble _tmp97_ = 0.0;
-				gdouble _tmp98_ = 0.0;
-				gint _tmp99_ = 0;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp95_ = scan_line;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp96_ = page_view_page_to_screen_x (self, _tmp95_);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp96_;
-#line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp97_ = s;
-#line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = _tmp97_ + 0.5;
-#line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = (gdouble) 0;
-#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp98_ = s;
-#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = _tmp98_ + 0.5;
-#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp99_ = h;
-#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (gdouble) _tmp99_;
-#line 904 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 5858 "page-view.c"
-			}
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 5862 "page-view.c"
-			{
-				gint _tmp100_ = 0;
-				gint _tmp101_ = 0;
-				gint _tmp102_ = 0;
-				gdouble _tmp103_ = 0.0;
-				gint _tmp104_ = 0;
-				gdouble _tmp105_ = 0.0;
-				gint _tmp106_ = 0;
-#line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp100_ = scan_line;
-#line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp101_ = page_view_page_to_screen_x (self, _tmp100_);
-#line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp101_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp102_ = w;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp103_ = s;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = (_tmp102_ - _tmp103_) + 0.5;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = (gdouble) 0;
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp104_ = w;
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp105_ = s;
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = (_tmp104_ - _tmp105_) + 0.5;
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp106_ = h;
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (gdouble) _tmp106_;
-#line 909 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 5897 "page-view.c"
-			}
-			default:
-			{
-				gdouble _tmp107_ = 0.0;
-				gdouble _tmp108_ = 0.0;
-				gdouble _tmp109_ = 0.0;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (gdouble) 0;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp107_ = y2;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = _tmp107_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp108_ = x2;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = _tmp108_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp109_ = y1;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = _tmp109_;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 5920 "page-view.c"
-			}
-		}
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp110_ = context;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp111_ = x1;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp112_ = y1;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_move_to (_tmp110_, _tmp111_, _tmp112_);
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp113_ = context;
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp114_ = x2;
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp115_ = y2;
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_line_to (_tmp113_, _tmp114_, _tmp115_);
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp116_ = context;
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgb (_tmp116_, 1.0, 0.0, 0.0);
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp117_ = context;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_stroke (_tmp117_);
-#line 5947 "page-view.c"
-	}
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp118_ = self->priv->_page;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp119_ = page_get_has_crop (_tmp118_);
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp120_ = _tmp119_;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp120_) {
-#line 5957 "page-view.c"
-		gint x = 0;
-		Page* _tmp121_ = NULL;
-		gint _tmp122_ = 0;
-		gint _tmp123_ = 0;
-		gint y = 0;
-		Page* _tmp124_ = NULL;
-		gint _tmp125_ = 0;
-		gint _tmp126_ = 0;
-		gint crop_width = 0;
-		Page* _tmp127_ = NULL;
-		gint _tmp128_ = 0;
-		gint _tmp129_ = 0;
-		gint crop_height = 0;
-		Page* _tmp130_ = NULL;
-		gint _tmp131_ = 0;
-		gint _tmp132_ = 0;
-		gint dx = 0;
-		gint _tmp133_ = 0;
-		gint _tmp134_ = 0;
-		gint dy = 0;
-		gint _tmp135_ = 0;
-		gint _tmp136_ = 0;
-		gint dw = 0;
-		gint _tmp137_ = 0;
-		gint _tmp138_ = 0;
-		gint dh = 0;
-		gint _tmp139_ = 0;
-		gint _tmp140_ = 0;
-		cairo_t* _tmp141_ = NULL;
-		gint _tmp142_ = 0;
-		gint _tmp143_ = 0;
-		cairo_t* _tmp144_ = NULL;
-		cairo_t* _tmp145_ = NULL;
-		gint _tmp146_ = 0;
-		gint _tmp147_ = 0;
-		gint _tmp148_ = 0;
-		gint _tmp149_ = 0;
-		cairo_t* _tmp150_ = NULL;
-		cairo_t* _tmp151_ = NULL;
-		cairo_t* _tmp152_ = NULL;
-		cairo_t* _tmp153_ = NULL;
-		gint _tmp154_ = 0;
-		gint _tmp155_ = 0;
-		gint _tmp156_ = 0;
-		gint _tmp157_ = 0;
-		cairo_t* _tmp158_ = NULL;
-		cairo_t* _tmp159_ = NULL;
-		cairo_t* _tmp160_ = NULL;
-		gint _tmp161_ = 0;
-		gint _tmp162_ = 0;
-		gint _tmp163_ = 0;
-		gint _tmp164_ = 0;
-		cairo_t* _tmp165_ = NULL;
-		cairo_t* _tmp166_ = NULL;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp121_ = self->priv->_page;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp122_ = page_get_crop_x (_tmp121_);
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp123_ = _tmp122_;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp123_;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp124_ = self->priv->_page;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp125_ = page_get_crop_y (_tmp124_);
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp126_ = _tmp125_;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		y = _tmp126_;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp127_ = self->priv->_page;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp128_ = page_get_crop_width (_tmp127_);
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp129_ = _tmp128_;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_width = _tmp129_;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp130_ = self->priv->_page;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp131_ = page_get_crop_height (_tmp130_);
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp132_ = _tmp131_;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_height = _tmp132_;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp133_ = x;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp134_ = page_view_page_to_screen_x (self, _tmp133_);
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dx = _tmp134_;
-#line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp135_ = y;
-#line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp136_ = page_view_page_to_screen_y (self, _tmp135_);
-#line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dy = _tmp136_;
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp137_ = crop_width;
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp138_ = page_view_page_to_screen_x (self, _tmp137_);
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dw = _tmp138_;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp139_ = crop_height;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp140_ = page_view_page_to_screen_y (self, _tmp139_);
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dh = _tmp140_;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp141_ = context;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp142_ = w;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp143_ = h;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp141_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp142_, (gdouble) _tmp143_);
-#line 936 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp144_ = context;
-#line 936 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_new_sub_path (_tmp144_);
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp145_ = context;
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp146_ = dx;
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp147_ = dy;
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp148_ = dw;
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp149_ = dh;
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp145_, (gdouble) _tmp146_, (gdouble) _tmp147_, (gdouble) _tmp148_, (gdouble) _tmp149_);
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp150_ = context;
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_fill_rule (_tmp150_, CAIRO_FILL_RULE_EVEN_ODD);
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp151_ = context;
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgba (_tmp151_, 0.25, 0.25, 0.25, 0.2);
-#line 940 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp152_ = context;
-#line 940 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_fill (_tmp152_);
-#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp153_ = context;
-#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp154_ = dx;
-#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp155_ = dy;
-#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp156_ = dw;
-#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp157_ = dh;
-#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp153_, _tmp154_ - 1.5, _tmp155_ - 1.5, (gdouble) (_tmp156_ + 3), (gdouble) (_tmp157_ + 3));
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp158_ = context;
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgb (_tmp158_, 1.0, 1.0, 1.0);
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp159_ = context;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_stroke (_tmp159_);
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp160_ = context;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp161_ = dx;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp162_ = dy;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp163_ = dw;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp164_ = dh;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp160_, _tmp161_ - 0.5, _tmp162_ - 0.5, (gdouble) (_tmp163_ + 1), (gdouble) (_tmp164_ + 1));
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp165_ = context;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgb (_tmp165_, 0.0, 0.0, 0.0);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp166_ = context;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_stroke (_tmp166_);
-#line 6144 "page-view.c"
-	}
-}
-
-
-static void page_view_page_pixels_changed_cb (PageView* self, Page* p) {
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (p != NULL);
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->update_image = TRUE;
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 6158 "page-view.c"
-}
-
-
-static void page_view_page_size_changed_cb (PageView* self, Page* p) {
-#line 1001 "/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"
-	g_return_if_fail (p != NULL);
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->update_image = TRUE;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "size-changed");
-#line 1006 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 6173 "page-view.c"
-}
-
-
-static void page_view_page_overlay_changed_cb (PageView* self, Page* p) {
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (p != NULL);
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 6184 "page-view.c"
-}
-
-
-static void page_view_scan_direction_changed_cb (PageView* self, Page* p) {
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (p != NULL);
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->update_image = TRUE;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "size-changed");
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 6199 "page-view.c"
-}
-
-
-Page* page_view_get_page (PageView* self) {
-	Page* result;
-	Page* _tmp0_ = NULL;
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->_page;
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 6214 "page-view.c"
-}
-
-
-static gpointer _page_ref0 (gpointer self) {
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return self ? page_ref (self) : NULL;
-#line 6221 "page-view.c"
-}
-
-
-static void page_view_set_page (PageView* self, Page* value) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = value;
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = _page_ref0 (_tmp0_);
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_page_unref0 (self->priv->_page);
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->_page = _tmp1_;
-#line 6238 "page-view.c"
-}
-
-
-gboolean page_view_get_selected (PageView* self) {
-	gboolean result;
-	gboolean _tmp0_ = FALSE;
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->selected_;
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 6253 "page-view.c"
-}
-
-
-void page_view_set_selected (PageView* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_view_get_selected (self);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = _tmp2_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp3_) {
-#line 6272 "page-view.c"
-		gboolean _tmp4_ = FALSE;
-		gboolean _tmp5_ = FALSE;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp4_ = page_view_get_selected (self);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = _tmp4_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp1_ = _tmp5_;
-#line 6281 "page-view.c"
-	} else {
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp1_ = FALSE;
-#line 6285 "page-view.c"
-	}
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp1_) {
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp0_ = TRUE;
-#line 6291 "page-view.c"
-	} else {
-		gboolean _tmp6_ = FALSE;
-		gboolean _tmp7_ = FALSE;
-		gboolean _tmp8_ = FALSE;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = page_view_get_selected (self);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp8_ = _tmp7_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (!_tmp8_) {
-#line 6302 "page-view.c"
-			gboolean _tmp9_ = FALSE;
-			gboolean _tmp10_ = FALSE;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp9_ = page_view_get_selected (self);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp10_ = _tmp9_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp6_ = !_tmp10_;
-#line 6311 "page-view.c"
-		} else {
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp6_ = FALSE;
-#line 6315 "page-view.c"
-		}
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp0_ = _tmp6_;
-#line 6319 "page-view.c"
-	}
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp0_) {
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 6325 "page-view.c"
-	}
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp11_ = page_view_get_selected (self);
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = _tmp11_;
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_set_selected (self, _tmp12_);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 6335 "page-view.c"
-}
-
-
-gint page_view_get_x_offset (PageView* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->_x_offset;
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 6350 "page-view.c"
-}
-
-
-void page_view_set_x_offset (PageView* self, gint value) {
-	gint _tmp0_ = 0;
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = value;
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->_x_offset = _tmp0_;
-#line 6362 "page-view.c"
-}
-
-
-gint page_view_get_y_offset (PageView* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->_y_offset;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 6377 "page-view.c"
-}
-
-
-void page_view_set_y_offset (PageView* self, gint value) {
-	gint _tmp0_ = 0;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = value;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->_y_offset = _tmp0_;
-#line 6389 "page-view.c"
-}
-
-
-GdkCursorType page_view_get_cursor (PageView* self) {
-	GdkCursorType result;
-	GdkCursorType _tmp0_ = 0;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->_cursor;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 6404 "page-view.c"
-}
-
-
-static void page_view_set_cursor (PageView* self, GdkCursorType value) {
-	GdkCursorType _tmp0_ = 0;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = value;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->_cursor = _tmp0_;
-#line 6416 "page-view.c"
-}
-
-
-gint page_view_get_width (PageView* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->width_;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 6431 "page-view.c"
-}
-
-
-void page_view_set_width (PageView* self, gint value) {
-	gint h = 0;
-	gint _tmp0_ = 0;
-	Page* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	Page* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = value;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->_page;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_get_height (_tmp1_);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = _tmp2_;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->_page;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = page_get_width (_tmp4_);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = _tmp5_;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	h = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = self->priv->width_;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = value;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp8_ == _tmp9_) {
-#line 6473 "page-view.c"
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = self->priv->height_;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = h;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = _tmp10_ == _tmp11_;
-#line 6482 "page-view.c"
-	} else {
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = FALSE;
-#line 6486 "page-view.c"
-	}
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp7_) {
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 6492 "page-view.c"
-	}
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = value;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->width_ = _tmp12_;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = h;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->height_ = _tmp13_;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->update_image = TRUE;
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "size-changed");
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 6508 "page-view.c"
-}
-
-
-gint page_view_get_height (PageView* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->height_;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 6523 "page-view.c"
-}
-
-
-void page_view_set_height (PageView* self, gint value) {
-	gint w = 0;
-	gint _tmp0_ = 0;
-	Page* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	Page* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = value;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->_page;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_get_width (_tmp1_);
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = _tmp2_;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->_page;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = page_get_height (_tmp4_);
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = _tmp5_;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	w = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = self->priv->width_;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = w;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp8_ == _tmp9_) {
-#line 6565 "page-view.c"
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = self->priv->height_;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = value;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = _tmp10_ == _tmp11_;
-#line 6574 "page-view.c"
-	} else {
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = FALSE;
-#line 6578 "page-view.c"
-	}
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp7_) {
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 6584 "page-view.c"
-	}
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = w;
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->width_ = _tmp12_;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = value;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->height_ = _tmp13_;
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->update_image = TRUE;
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "size-changed");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 6600 "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 6607 "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 6616 "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 6626 "page-view.c"
-	} else {
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 6630 "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 6638 "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 6645 "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 6652 "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 6656 "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 6660 "page-view.c"
-	} else {
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		value->data[0].v_pointer = NULL;
-#line 6664 "page-view.c"
-	}
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return NULL;
-#line 6668 "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 6679 "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 6685 "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 6689 "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 6693 "page-view.c"
-	}
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return NULL;
-#line 6697 "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 6711 "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 6720 "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 6740 "page-view.c"
-	} else {
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		value->data[0].v_pointer = NULL;
-#line 6744 "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 6750 "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 6769 "page-view.c"
-	} else {
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		value->data[0].v_pointer = NULL;
-#line 6773 "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 6779 "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"
-	((PageViewClass *) 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 6795 "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 35 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->selected_ = FALSE;
-#line 48 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->border_width = 1;
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->update_image = TRUE;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->_cursor = GDK_ARROW;
-#line 78 "/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 6816 "page-view.c"
-}
-
-
-static void page_view_finalize (PageView* obj) {
-	PageView * self;
-	Page* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	Page* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	Page* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	Page* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	Page* _tmp8_ = NULL;
-	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 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_handlers_destroy (self);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->_page;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 97 "/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 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->_page;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 98 "/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 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->_page;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
-#line 99 "/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 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = self->priv->_page;
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_parse_name ("scan-line-changed", TYPE_PAGE, &_tmp7_, NULL, FALSE);
-#line 100 "/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 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = self->priv->_page;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp9_, NULL, FALSE);
-#line 101 "/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 6870 "page-view.c"
-}
-
-
-GType page_view_get_type (void) {
-	static volatile gsize page_view_type_id__volatile = 0;
-	if (g_once_init_enter (&page_view_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_page_view_init, value_page_view_free_value, value_page_view_copy_value, value_page_view_peek_pointer, "p", value_page_view_collect_value, "p", value_page_view_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PageViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) page_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PageView), 0, (GInstanceInitFunc) page_view_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 page_view_type_id;
-		page_view_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PageView", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&page_view_type_id__volatile, page_view_type_id);
-	}
-	return page_view_type_id__volatile;
-}
-
-
-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 6895 "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 6908 "page-view.c"
-	}
-}
-
-
-
diff --git a/src/page.c b/src/page.c
deleted file mode 100644
index 9a3db07..0000000
--- a/src/page.c
+++ /dev/null
@@ -1,4943 +0,0 @@
-/* page.c generated by valac 0.34.6, the Vala compiler
- * generated from page.vala, do not modify */
-
-/*
- * Copyright (C) 2009-2015 Canonical Ltd.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 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.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <float.h>
-#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>
-
-
-#define TYPE_SCAN_DIRECTION (scan_direction_get_type ())
-
-#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;
-typedef struct _PagePrivate PagePrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#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 TYPE_SCAN_LINE (scan_line_get_type ())
-#define SCAN_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_LINE, ScanLine))
-#define SCAN_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_LINE, ScanLineClass))
-#define IS_SCAN_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_LINE))
-#define IS_SCAN_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_LINE))
-#define SCAN_LINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_LINE, ScanLineClass))
-
-typedef struct _ScanLine ScanLine;
-typedef struct _ScanLineClass ScanLineClass;
-typedef struct _ScanLinePrivate ScanLinePrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-
-#define TYPE_PIXBUF_WRITER (pixbuf_writer_get_type ())
-#define PIXBUF_WRITER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXBUF_WRITER, PixbufWriter))
-#define PIXBUF_WRITER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXBUF_WRITER, PixbufWriterClass))
-#define IS_PIXBUF_WRITER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXBUF_WRITER))
-#define IS_PIXBUF_WRITER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXBUF_WRITER))
-#define PIXBUF_WRITER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXBUF_WRITER, PixbufWriterClass))
-
-typedef struct _PixbufWriter PixbufWriter;
-typedef struct _PixbufWriterClass PixbufWriterClass;
-#define _pixbuf_writer_unref0(var) ((var == NULL) ? NULL : (var = (pixbuf_writer_unref (var), NULL)))
-typedef struct _ParamSpecPage ParamSpecPage;
-typedef struct _PixbufWriterPrivate PixbufWriterPrivate;
-typedef struct _ParamSpecPixbufWriter ParamSpecPixbufWriter;
-
-typedef enum  {
-	SCAN_DIRECTION_TOP_TO_BOTTOM,
-	SCAN_DIRECTION_LEFT_TO_RIGHT,
-	SCAN_DIRECTION_BOTTOM_TO_TOP,
-	SCAN_DIRECTION_RIGHT_TO_LEFT
-} ScanDirection;
-
-struct _Page {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PagePrivate * priv;
-};
-
-struct _PageClass {
-	GTypeClass parent_class;
-	void (*finalize) (Page *self);
-};
-
-struct _PagePrivate {
-	gint _dpi;
-	gint expected_rows;
-	gint _depth;
-	gchar* _color_profile;
-	gint _scan_width;
-	gint _scan_height;
-	gint _rowstride;
-	gint _n_channels;
-	guchar* pixels;
-	gint pixels_length1;
-	gint _pixels_size_;
-	gboolean _is_scanning;
-	gboolean _has_data;
-	gint _scan_line;
-	ScanDirection scan_direction_;
-	gboolean _has_crop;
-	gchar* _crop_name;
-	gint _crop_x;
-	gint _crop_y;
-	gint _crop_width;
-	gint _crop_height;
-};
-
-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 _ScanLine {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanLinePrivate * priv;
-	gint number;
-	gint n_lines;
-	gint width;
-	gint depth;
-	gint channel;
-	guchar* data;
-	gint data_length1;
-	gint data_length;
-};
-
-struct _ScanLineClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanLine *self);
-};
-
-struct _ParamSpecPage {
-	GParamSpec parent_instance;
-};
-
-struct _PixbufWriter {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PixbufWriterPrivate * priv;
-	GFileOutputStream* stream;
-};
-
-struct _PixbufWriterClass {
-	GTypeClass parent_class;
-	void (*finalize) (PixbufWriter *self);
-};
-
-struct _ParamSpecPixbufWriter {
-	GParamSpec parent_instance;
-};
-
-
-static gpointer page_parent_class = NULL;
-static gpointer pixbuf_writer_parent_class = NULL;
-
-GType scan_direction_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 PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PAGE, PagePrivate))
-enum  {
-	PAGE_DUMMY_PROPERTY
-};
-Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction);
-Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction);
-static void page_set_scan_width (Page* self, gint value);
-static void page_set_scan_height (Page* self, gint value);
-static void page_set_dpi (Page* self, gint value);
-void page_set_scan_direction (Page* self, ScanDirection value);
-Page* page_new_from_data (gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height);
-Page* page_construct_from_data (GType object_type, gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height);
-static void page_set_rowstride (Page* self, gint value);
-static void page_set_n_channels (Page* self, gint value);
-static void page_set_depth (Page* self, gint value);
-void page_set_color_profile (Page* self, const gchar* value);
-static guchar* _vala_array_dup3 (guchar* self, int length);
-static void page_set_has_data (Page* self, gboolean value);
-static void page_set_has_crop (Page* self, gboolean value);
-static void page_set_crop_name (Page* self, const gchar* value);
-static void page_set_crop_x (Page* self, gint value);
-static void page_set_crop_y (Page* self, gint value);
-static void page_set_crop_width (Page* self, gint value);
-static void page_set_crop_height (Page* self, gint value);
-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);
-gint page_get_scan_height (Page* self);
-gint page_get_scan_width (Page* self);
-gint page_get_depth (Page* self);
-gint page_get_n_channels (Page* self);
-gint page_get_rowstride (Page* self);
-void page_start (Page* self);
-static void page_set_is_scanning (Page* self, gboolean value);
-gpointer scan_line_ref (gpointer instance);
-void scan_line_unref (gpointer instance);
-GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scan_line (GValue* value, gpointer v_object);
-void value_take_scan_line (GValue* value, gpointer v_object);
-gpointer value_get_scan_line (const GValue* value);
-GType scan_line_get_type (void) G_GNUC_CONST;
-static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_changed);
-static void page_set_scan_line (Page* self, gint value);
-void page_parse_scan_line (Page* self, ScanLine* line);
-void page_finish (Page* self);
-gint page_get_scan_line (Page* self);
-void page_rotate_left (Page* self);
-ScanDirection page_get_scan_direction (Page* self);
-void page_rotate_right (Page* self);
-void page_set_no_crop (Page* self);
-gboolean page_get_has_crop (Page* self);
-void page_set_custom_crop (Page* self, gint width, gint height);
-const gchar* page_get_crop_name (Page* self);
-gint page_get_crop_width (Page* self);
-gint page_get_crop_height (Page* self);
-void page_set_named_crop (Page* self, const gchar* name);
-gint page_get_width (Page* self);
-gint page_get_height (Page* self);
-gint page_get_dpi (Page* self);
-void page_move_crop (Page* self, gint x, gint y);
-void page_rotate_crop (Page* self);
-gint page_get_crop_x (Page* self);
-gint page_get_crop_y (Page* self);
-guchar* page_get_pixels (Page* self, int* result_length1);
-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_copy_to_clipboard (Page* self, GtkWindow* window);
-void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
-gpointer pixbuf_writer_ref (gpointer instance);
-void pixbuf_writer_unref (gpointer instance);
-GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixbuf_writer (GValue* value, gpointer v_object);
-void value_take_pixbuf_writer (GValue* value, gpointer v_object);
-gpointer value_get_pixbuf_writer (const GValue* value);
-GType pixbuf_writer_get_type (void) G_GNUC_CONST;
-PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream);
-PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* stream);
-const gchar* page_get_color_profile (Page* self);
-void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type, gchar** option_keys, int option_keys_length1, gchar** option_values, int option_values_length1, GError** error);
-gboolean page_get_is_landscape (Page* self);
-gboolean page_get_is_scanning (Page* self);
-gboolean page_get_has_data (Page* self);
-gboolean page_get_is_color (Page* self);
-static void page_finalize (Page* obj);
-enum  {
-	PIXBUF_WRITER_DUMMY_PROPERTY
-};
-static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf, int buf_length1, GError** error);
-static gboolean _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self);
-static void pixbuf_writer_finalize (PixbufWriter* 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);
-
-
-GType scan_direction_get_type (void) {
-	static volatile gsize scan_direction_type_id__volatile = 0;
-	if (g_once_init_enter (&scan_direction_type_id__volatile)) {
-		static const GEnumValue values[] = {{SCAN_DIRECTION_TOP_TO_BOTTOM, "SCAN_DIRECTION_TOP_TO_BOTTOM", "top-to-bottom"}, {SCAN_DIRECTION_LEFT_TO_RIGHT, "SCAN_DIRECTION_LEFT_TO_RIGHT", "left-to-right"}, {SCAN_DIRECTION_BOTTOM_TO_TOP, "SCAN_DIRECTION_BOTTOM_TO_TOP", "bottom-to-top"}, {SCAN_DIRECTION_RIGHT_TO_LEFT, "SCAN_DIRECTION_RIGHT_TO_LEFT", "right-to-left"}, {0, NULL, NULL}};
-		GType scan_direction_type_id;
-		scan_direction_type_id = g_enum_register_static ("ScanDirection", values);
-		g_once_init_leave (&scan_direction_type_id__volatile, scan_direction_type_id);
-	}
-	return scan_direction_type_id__volatile;
-}
-
-
-Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction) {
-	Page* self = NULL;
-	gboolean _tmp0_ = FALSE;
-	ScanDirection _tmp1_ = 0;
-	gint _tmp7_ = 0;
-	ScanDirection _tmp8_ = 0;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self = (Page*) g_type_create_instance (object_type);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = scan_direction;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = TRUE;
-#line 319 "page.c"
-	} else {
-		ScanDirection _tmp2_ = 0;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = scan_direction;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 326 "page.c"
-	}
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp0_) {
-#line 330 "page.c"
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = width;
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_width (self, _tmp3_);
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = height;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_height (self, _tmp4_);
-#line 341 "page.c"
-	} else {
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = height;
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_width (self, _tmp5_);
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = width;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_height (self, _tmp6_);
-#line 353 "page.c"
-	}
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = dpi;
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_dpi (self, _tmp7_);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = scan_direction;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_direction (self, _tmp8_);
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return self;
-#line 365 "page.c"
-}
-
-
-Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction) {
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return page_construct (TYPE_PAGE, width, height, dpi, scan_direction);
-#line 372 "page.c"
-}
-
-
-static guchar* _vala_array_dup3 (guchar* self, int length) {
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return g_memdup (self, length * sizeof (guchar));
-#line 379 "page.c"
-}
-
-
-Page* page_construct_from_data (GType object_type, gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height) {
-	Page* self = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	ScanDirection _tmp7_ = 0;
-	const gchar* _tmp8_ = NULL;
-	guchar* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	guchar* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	guchar* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	gboolean _tmp12_ = FALSE;
-	const gchar* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self = (Page*) g_type_create_instance (object_type);
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = scan_width;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_width (self, _tmp0_);
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = scan_height;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_height (self, _tmp1_);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = scan_height;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->expected_rows = _tmp2_;
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = rowstride;
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_rowstride (self, _tmp3_);
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = n_channels;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_n_channels (self, _tmp4_);
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = depth;
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_depth (self, _tmp5_);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp6_ = dpi;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_dpi (self, _tmp6_);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = scan_direction;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_direction (self, _tmp7_);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = color_profile;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_color_profile (self, _tmp8_);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9_ = pixels;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9__length1 = pixels_length1;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp10_ = (_tmp9_ != NULL) ? _vala_array_dup3 (_tmp9_, _tmp9__length1) : ((gpointer) _tmp9_);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp10__length1 = _tmp9__length1;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->pixels = (g_free (self->priv->pixels), NULL);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->pixels = _tmp10_;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->pixels_length1 = _tmp10__length1;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_pixels_size_ = self->priv->pixels_length1;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp11_ = pixels;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp11__length1 = pixels_length1;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_has_data (self, _tmp11_ != NULL);
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp12_ = has_crop;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_has_crop (self, _tmp12_);
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp13_ = crop_name;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_name (self, _tmp13_);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp14_ = crop_x;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_x (self, _tmp14_);
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp15_ = crop_y;
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_y (self, _tmp15_);
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp16_ = crop_width;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_width (self, _tmp16_);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp17_ = crop_height;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_height (self, _tmp17_);
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return self;
-#line 492 "page.c"
-}
-
-
-Page* page_new_from_data (gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height) {
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return page_construct_from_data (TYPE_PAGE, scan_width, scan_height, rowstride, n_channels, depth, dpi, scan_direction, color_profile, pixels, pixels_length1, has_crop, crop_name, crop_x, crop_y, crop_width, crop_height);
-#line 499 "page.c"
-}
-
-
-void page_set_page_info (Page* self, ScanPageInfo* info) {
-	ScanPageInfo* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	ScanPageInfo* _tmp2_ = NULL;
-	gdouble _tmp3_ = 0.0;
-	ScanPageInfo* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	ScanPageInfo* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	ScanPageInfo* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	ScanPageInfo* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	guchar* _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	gint _tmp21_ = 0;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (info != NULL);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = info;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = _tmp0_->height;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->expected_rows = _tmp1_;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = info;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = _tmp2_->dpi;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_dpi (self, (gint) _tmp3_);
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = info;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = _tmp4_->width;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_width (self, _tmp5_);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp6_ = info;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = _tmp6_->height;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_height (self, _tmp7_);
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = self->priv->_scan_height;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp8_ < 0) {
-#line 558 "page.c"
-		gint _tmp9_ = 0;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = self->priv->_scan_width;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_height (self, _tmp9_ / 2);
-#line 564 "page.c"
-	}
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp10_ = info;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp11_ = _tmp10_->depth;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_depth (self, _tmp11_);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp12_ = info;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp13_ = _tmp12_->n_channels;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_n_channels (self, _tmp13_);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp14_ = self->priv->_scan_width;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp15_ = self->priv->_depth;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp16_ = self->priv->_n_channels;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_rowstride (self, (((_tmp14_ * _tmp15_) * _tmp16_) + 7) / 8);
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp17_ = self->priv->_scan_height;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp18_ = self->priv->_rowstride;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp19_ = _tmp17_ * _tmp18_;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp17_ * _tmp18_);
-#line 239 "/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 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->pixels_length1 = _tmp19_;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_pixels_size_ = _tmp19_;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp20_ = self->priv->pixels;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp20__length1 = self->priv->pixels_length1;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (_tmp20_ != NULL);
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp21_ = self->priv->_depth;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp21_ == 1) {
-#line 610 "page.c"
-		guchar* _tmp22_ = NULL;
-		gint _tmp22__length1 = 0;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_ = self->priv->pixels;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22__length1 = self->priv->pixels_length1;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23_ = self->priv->_scan_height;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_ = self->priv->_rowstride;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		memset (_tmp22_, 0x00, (gsize) (_tmp23_ * _tmp24_));
-#line 625 "page.c"
-	} else {
-		guchar* _tmp25_ = NULL;
-		gint _tmp25__length1 = 0;
-		gint _tmp26_ = 0;
-		gint _tmp27_ = 0;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25_ = self->priv->pixels;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25__length1 = self->priv->pixels_length1;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp26_ = self->priv->_scan_height;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp27_ = self->priv->_rowstride;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		memset (_tmp25_, 0xFF, (gsize) (_tmp26_ * _tmp27_));
-#line 641 "page.c"
-	}
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "size-changed");
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "pixels-changed");
-#line 647 "page.c"
-}
-
-
-void page_start (Page* self) {
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_is_scanning (self, TRUE);
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "scan-line-changed");
-#line 658 "page.c"
-}
-
-
-static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_changed) {
-	gboolean _vala_size_changed = FALSE;
-	gint line_number = 0;
-	ScanLine* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint offset = 0;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	gint line_offset = 0;
-	gint _tmp15_ = 0;
-	ScanLine* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp32_ = 0;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (line != NULL);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = line;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = _tmp0_->number;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = n;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	line_number = _tmp1_ + _tmp2_;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_vala_size_changed = FALSE;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	while (TRUE) {
-#line 692 "page.c"
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		gint rows = 0;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = line_number;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = self->priv->_scan_height;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (!(_tmp3_ >= _tmp4_)) {
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 712 "page.c"
-		}
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->_scan_height;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		rows = _tmp5_;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = rows;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->_scan_width;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_height (self, _tmp6_ + (_tmp7_ / 2));
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = rows;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = self->priv->_scan_height;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_debug ("page.vala:269: Extending image from %d lines to %d lines", _tmp8_, _tmp9_);
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp10_ = self->priv->_scan_height;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = self->priv->_rowstride;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp12_ = _tmp10_ * _tmp11_;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp10_ * _tmp11_);
-#line 270 "/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 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->pixels_length1 = _tmp12_;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->_pixels_size_ = _tmp12_;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_vala_size_changed = TRUE;
-#line 746 "page.c"
-	}
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp13_ = line_number;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp14_ = self->priv->_rowstride;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	offset = _tmp13_ * _tmp14_;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp15_ = n;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp16_ = line;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp17_ = _tmp16_->data_length;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	line_offset = _tmp15_ * _tmp17_;
-#line 762 "page.c"
-	{
-		gint i = 0;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		i = 0;
-#line 767 "page.c"
-		{
-			gboolean _tmp18_ = FALSE;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp18_ = TRUE;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			while (TRUE) {
-#line 774 "page.c"
-				gint _tmp20_ = 0;
-				ScanLine* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
-				guchar* _tmp23_ = NULL;
-				gint _tmp23__length1 = 0;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
-				ScanLine* _tmp26_ = NULL;
-				guchar* _tmp27_ = NULL;
-				gint _tmp27__length1 = 0;
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
-				guchar _tmp30_ = '\0';
-				guchar _tmp31_ = '\0';
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!_tmp18_) {
-#line 791 "page.c"
-					gint _tmp19_ = 0;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp19_ = i;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					i = _tmp19_ + 1;
-#line 797 "page.c"
-				}
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp18_ = FALSE;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp20_ = i;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp21_ = line;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp22_ = _tmp21_->data_length;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!(_tmp20_ < _tmp22_)) {
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					break;
-#line 811 "page.c"
-				}
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp23_ = self->priv->pixels;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp23__length1 = self->priv->pixels_length1;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp24_ = offset;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp25_ = i;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp26_ = line;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp27_ = _tmp26_->data;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp27__length1 = _tmp26_->data_length1;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp28_ = line_offset;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp29_ = i;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp30_ = _tmp27_[_tmp28_ + _tmp29_];
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp23_[_tmp24_ + _tmp25_] = _tmp30_;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp31_ = _tmp23_[_tmp24_ + _tmp25_];
-#line 837 "page.c"
-			}
-		}
-	}
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp32_ = line_number;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_line (self, _tmp32_);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (size_changed) {
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*size_changed = _vala_size_changed;
-#line 849 "page.c"
-	}
-}
-
-
-void page_parse_scan_line (Page* self, ScanLine* line) {
-	gboolean size_has_changed = FALSE;
-	gboolean _tmp8_ = FALSE;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (line != NULL);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	size_has_changed = FALSE;
-#line 863 "page.c"
-	{
-		gint i = 0;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		i = 0;
-#line 868 "page.c"
-		{
-			gboolean _tmp0_ = FALSE;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp0_ = TRUE;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			while (TRUE) {
-#line 875 "page.c"
-				gint _tmp2_ = 0;
-				ScanLine* _tmp3_ = NULL;
-				gint _tmp4_ = 0;
-				ScanLine* _tmp5_ = NULL;
-				gint _tmp6_ = 0;
-				gboolean _tmp7_ = FALSE;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!_tmp0_) {
-#line 884 "page.c"
-					gint _tmp1_ = 0;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp1_ = i;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					i = _tmp1_ + 1;
-#line 890 "page.c"
-				}
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp0_ = FALSE;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp2_ = i;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp3_ = line;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp4_ = _tmp3_->n_lines;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!(_tmp2_ < _tmp4_)) {
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					break;
-#line 904 "page.c"
-				}
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp5_ = line;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp6_ = i;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_parse_line (self, _tmp5_, _tmp6_, &_tmp7_);
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				size_has_changed = _tmp7_;
-#line 914 "page.c"
-			}
-		}
-	}
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_has_data (self, TRUE);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = size_has_changed;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp8_) {
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_signal_emit_by_name (self, "size-changed");
-#line 926 "page.c"
-	}
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "scan-line-changed");
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "pixels-changed");
-#line 932 "page.c"
-}
-
-
-void page_finish (Page* self) {
-	gboolean size_has_changed = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	gboolean _tmp11_ = FALSE;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	size_has_changed = FALSE;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = self->priv->expected_rows;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp1_ < 0) {
-#line 949 "page.c"
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = self->priv->_scan_line;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = self->priv->_scan_height;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = _tmp2_ != _tmp3_;
-#line 958 "page.c"
-	} else {
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = FALSE;
-#line 962 "page.c"
-	}
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp0_) {
-#line 966 "page.c"
-		gint rows = 0;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = self->priv->_scan_height;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		rows = _tmp4_;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->_scan_line;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_height (self, _tmp5_);
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_scan_height;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->_rowstride;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = _tmp6_ * _tmp7_;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp6_ * _tmp7_);
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		(_tmp8_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp8_ - self->priv->pixels_length1)) : NULL;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->pixels_length1 = _tmp8_;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->_pixels_size_ = _tmp8_;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = rows;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp10_ = self->priv->_scan_height;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_debug ("page.vala:309: Trimming page from %d lines to %d lines", _tmp9_, _tmp10_);
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		size_has_changed = TRUE;
-#line 1005 "page.c"
-	}
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_is_scanning (self, FALSE);
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp11_ = size_has_changed;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp11_) {
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_signal_emit_by_name (self, "size-changed");
-#line 1015 "page.c"
-	}
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "scan-line-changed");
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "scan-finished");
-#line 1021 "page.c"
-}
-
-
-void page_rotate_left (Page* self) {
-	ScanDirection _tmp0_ = 0;
-	ScanDirection _tmp1_ = 0;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = page_get_scan_direction (self);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = _tmp0_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	switch (_tmp1_) {
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1038 "page.c"
-		{
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1044 "page.c"
-		}
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1048 "page.c"
-		{
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1054 "page.c"
-		}
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1058 "page.c"
-		{
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT);
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1064 "page.c"
-		}
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1068 "page.c"
-		{
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1074 "page.c"
-		}
-		default:
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		break;
-#line 1079 "page.c"
-	}
-}
-
-
-void page_rotate_right (Page* self) {
-	ScanDirection _tmp0_ = 0;
-	ScanDirection _tmp1_ = 0;
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = page_get_scan_direction (self);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = _tmp0_;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	switch (_tmp1_) {
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1097 "page.c"
-		{
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1103 "page.c"
-		}
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1107 "page.c"
-		{
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM);
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1113 "page.c"
-		}
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1117 "page.c"
-		{
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1123 "page.c"
-		}
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1127 "page.c"
-		{
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP);
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1133 "page.c"
-		}
-		default:
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		break;
-#line 1138 "page.c"
-	}
-}
-
-
-void page_set_no_crop (Page* self) {
-	gboolean _tmp0_ = FALSE;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_has_crop;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (!_tmp0_) {
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return;
-#line 1153 "page.c"
-	}
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_has_crop (self, FALSE);
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_name (self, NULL);
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_x (self, 0);
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_y (self, 0);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_width (self, 0);
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_height (self, 0);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "crop-changed");
-#line 1169 "page.c"
-}
-
-
-void page_set_custom_crop (Page* self, gint width, gint height) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-#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_ = width;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (_tmp0_ >= 1);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = height;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (_tmp1_ >= 1);
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = self->priv->_crop_name;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp5_ == NULL) {
-#line 1196 "page.c"
-		gboolean _tmp6_ = FALSE;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_has_crop;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = _tmp6_;
-#line 1202 "page.c"
-	} else {
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = FALSE;
-#line 1206 "page.c"
-	}
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp4_) {
-#line 1210 "page.c"
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->_crop_width;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = width;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = _tmp7_ == _tmp8_;
-#line 1219 "page.c"
-	} else {
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = FALSE;
-#line 1223 "page.c"
-	}
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp3_) {
-#line 1227 "page.c"
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = self->priv->_crop_height;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp10_ = height;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = _tmp9_ == _tmp10_;
-#line 1236 "page.c"
-	} else {
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = FALSE;
-#line 1240 "page.c"
-	}
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp2_) {
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return;
-#line 1246 "page.c"
-	}
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_name (self, NULL);
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_has_crop (self, TRUE);
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp11_ = width;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_width (self, _tmp11_);
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp12_ = height;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_height (self, _tmp12_);
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "crop-changed");
-#line 1262 "page.c"
-}
-
-
-void page_set_named_crop (Page* self, const gchar* name) {
-	gdouble w = 0.0;
-	gdouble h = 0.0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GQuark _tmp3_ = 0U;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	static GQuark _tmp2_label0 = 0;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	static GQuark _tmp2_label1 = 0;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	static GQuark _tmp2_label2 = 0;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	static GQuark _tmp2_label3 = 0;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	static GQuark _tmp2_label4 = 0;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	static GQuark _tmp2_label5 = 0;
-#line 1284 "page.c"
-	const gchar* _tmp5_ = NULL;
-	gint pw = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint ph = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gdouble _tmp15_ = 0.0;
-	gint _tmp16_ = 0;
-	gdouble _tmp17_ = 0.0;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (name != NULL);
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = name;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = _tmp0_;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 402 "/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 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		switch (0) {
-#line 1316 "page.c"
-			default:
-			{
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				w = 8.3;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				h = 11.7;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 1325 "page.c"
-			}
-		}
-	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("A5")))) {
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		switch (0) {
-#line 1331 "page.c"
-			default:
-			{
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				w = 5.8;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				h = 8.3;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 1340 "page.c"
-			}
-		}
-	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("A6")))) {
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		switch (0) {
-#line 1346 "page.c"
-			default:
-			{
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				w = 4.1;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				h = 5.8;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 1355 "page.c"
-			}
-		}
-	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("letter")))) {
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		switch (0) {
-#line 1361 "page.c"
-			default:
-			{
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				w = 8.5;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				h = (gdouble) 11;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 1370 "page.c"
-			}
-		}
-	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("legal")))) {
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		switch (0) {
-#line 1376 "page.c"
-			default:
-			{
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				w = 8.5;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				h = (gdouble) 14;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 1385 "page.c"
-			}
-		}
-	} else if (_tmp3_ == ((0 != _tmp2_label5) ? _tmp2_label5 : (_tmp2_label5 = g_quark_from_static_string ("4x6")))) {
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		switch (0) {
-#line 1391 "page.c"
-			default:
-			{
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				w = (gdouble) 4;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				h = (gdouble) 6;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 1400 "page.c"
-			}
-		}
-	} else {
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		switch (0) {
-#line 1406 "page.c"
-			default:
-			{
-				const gchar* _tmp4_ = NULL;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp4_ = name;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				g_warning ("page.vala:429: Unknown paper size '%s'", _tmp4_);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				return;
-#line 1416 "page.c"
-			}
-		}
-	}
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = name;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_name (self, _tmp5_);
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_has_crop (self, TRUE);
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp6_ = page_get_width (self);
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = _tmp6_;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	pw = _tmp7_;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = page_get_height (self);
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9_ = _tmp8_;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	ph = _tmp9_;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp10_ = pw;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp11_ = ph;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp10_ > _tmp11_) {
-#line 1444 "page.c"
-		gdouble t = 0.0;
-		gdouble _tmp12_ = 0.0;
-		gdouble _tmp13_ = 0.0;
-		gdouble _tmp14_ = 0.0;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp12_ = w;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		t = _tmp12_;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp13_ = h;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		w = _tmp13_;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp14_ = t;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		h = _tmp14_;
-#line 1461 "page.c"
-	}
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp15_ = w;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp16_ = self->priv->_dpi;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_width (self, (gint) ((_tmp15_ * _tmp16_) + 0.5));
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp17_ = h;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp18_ = self->priv->_dpi;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_height (self, (gint) ((_tmp17_ * _tmp18_) + 0.5));
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp19_ = self->priv->_crop_width;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp20_ = pw;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp19_ < _tmp20_) {
-#line 1481 "page.c"
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp21_ = pw;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_ = self->priv->_crop_width;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_crop_x (self, (_tmp21_ - _tmp22_) / 2);
-#line 1490 "page.c"
-	} else {
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_crop_x (self, 0);
-#line 1494 "page.c"
-	}
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp23_ = self->priv->_crop_height;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp24_ = ph;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp23_ < _tmp24_) {
-#line 1502 "page.c"
-		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25_ = ph;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp26_ = self->priv->_crop_height;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_crop_y (self, (_tmp25_ - _tmp26_) / 2);
-#line 1511 "page.c"
-	} else {
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_crop_y (self, 0);
-#line 1515 "page.c"
-	}
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "crop-changed");
-#line 1519 "page.c"
-}
-
-
-void page_move_crop (Page* self, gint x, gint y) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = x;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (_tmp0_ >= 0);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = y;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (_tmp1_ >= 0);
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = x;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = page_get_width (self);
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = _tmp3_;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (_tmp2_ < _tmp4_);
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = y;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp6_ = page_get_height (self);
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = _tmp6_;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (_tmp5_ < _tmp7_);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = x;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_x (self, _tmp8_);
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9_ = y;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_y (self, _tmp9_);
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "crop-changed");
-#line 1570 "page.c"
-}
-
-
-void page_rotate_crop (Page* self) {
-	gboolean _tmp0_ = FALSE;
-	gint t = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	const gchar* _tmp4_ = NULL;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_has_crop;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (!_tmp0_) {
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return;
-#line 1589 "page.c"
-	}
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = self->priv->_crop_width;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	t = _tmp1_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = self->priv->_crop_height;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_width (self, _tmp2_);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = t;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_height (self, _tmp3_);
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = self->priv->_crop_name;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp4_ == NULL) {
-#line 1607 "page.c"
-		gint w = 0;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		gint h = 0;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gint _tmp14_ = 0;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-		gint _tmp21_ = 0;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = page_get_width (self);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = _tmp5_;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		w = _tmp6_;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = page_get_height (self);
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = _tmp7_;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		h = _tmp8_;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = self->priv->_crop_x;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp10_ = self->priv->_crop_width;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = w;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if ((_tmp9_ + _tmp10_) > _tmp11_) {
-#line 1642 "page.c"
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp12_ = w;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp13_ = self->priv->_crop_width;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_crop_x (self, _tmp12_ - _tmp13_);
-#line 1651 "page.c"
-		}
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp14_ = self->priv->_crop_x;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp14_ < 0) {
-#line 1657 "page.c"
-			gint _tmp15_ = 0;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_crop_x (self, 0);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp15_ = w;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_crop_width (self, _tmp15_);
-#line 1665 "page.c"
-		}
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp16_ = self->priv->_crop_y;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp17_ = self->priv->_crop_height;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp18_ = h;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if ((_tmp16_ + _tmp17_) > _tmp18_) {
-#line 1675 "page.c"
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp19_ = h;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp20_ = self->priv->_crop_height;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_crop_y (self, _tmp19_ - _tmp20_);
-#line 1684 "page.c"
-		}
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp21_ = self->priv->_crop_y;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp21_ < 0) {
-#line 1690 "page.c"
-			gint _tmp22_ = 0;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_crop_y (self, 0);
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp22_ = h;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			page_set_crop_height (self, _tmp22_);
-#line 1698 "page.c"
-		}
-	}
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "crop-changed");
-#line 1703 "page.c"
-}
-
-
-guchar* page_get_pixels (Page* self, int* result_length1) {
-	guchar* result = NULL;
-	guchar* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	guchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->pixels;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0__length1 = self->priv->pixels_length1;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = _tmp0_;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (result_length1) {
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*result_length1 = _tmp1__length1;
-#line 1727 "page.c"
-	}
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp1_;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1733 "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 514 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, '\0');
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = (guchar) 0xFF;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1745 "page.c"
-}
-
-
-static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel_length1, gint offset) {
-	ScanDirection _tmp0_ = 0;
-	ScanDirection _tmp1_ = 0;
-	gint line_offset = 0;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gboolean _tmp16_ = FALSE;
-	gint _tmp17_ = 0;
-	guchar* _tmp98_ = NULL;
-	gint _tmp98__length1 = 0;
-	gint _tmp99_ = 0;
-	guchar* _tmp100_ = NULL;
-	gint _tmp100__length1 = 0;
-	gint _tmp101_ = 0;
-	gint _tmp102_ = 0;
-	gint _tmp103_ = 0;
-	gint _tmp104_ = 0;
-	guchar _tmp105_ = '\0';
-	guchar _tmp106_ = '\0';
-	guchar* _tmp107_ = NULL;
-	gint _tmp107__length1 = 0;
-	gint _tmp108_ = 0;
-	guchar* _tmp109_ = NULL;
-	gint _tmp109__length1 = 0;
-	gint _tmp110_ = 0;
-	gint _tmp111_ = 0;
-	gint _tmp112_ = 0;
-	gint _tmp113_ = 0;
-	guchar _tmp114_ = '\0';
-	guchar _tmp115_ = '\0';
-	guchar* _tmp116_ = NULL;
-	gint _tmp116__length1 = 0;
-	gint _tmp117_ = 0;
-	guchar* _tmp118_ = NULL;
-	gint _tmp118__length1 = 0;
-	gint _tmp119_ = 0;
-	gint _tmp120_ = 0;
-	gint _tmp121_ = 0;
-	gint _tmp122_ = 0;
-	guchar _tmp123_ = '\0';
-	guchar _tmp124_ = '\0';
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = page_get_scan_direction (self);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = _tmp0_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	switch (_tmp1_) {
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1800 "page.c"
-		{
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1804 "page.c"
-		}
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1808 "page.c"
-		{
-			gint _tmp2_ = 0;
-			gint _tmp3_ = 0;
-			gint _tmp4_ = 0;
-			gint _tmp5_ = 0;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp2_ = self->priv->_scan_width;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp3_ = x;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			x = (_tmp2_ - _tmp3_) - 1;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp4_ = self->priv->_scan_height;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp5_ = y;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			y = (_tmp4_ - _tmp5_) - 1;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1828 "page.c"
-		}
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1832 "page.c"
-		{
-			gint t = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp6_ = x;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			t = _tmp6_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp7_ = self->priv->_scan_width;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp8_ = y;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			x = (_tmp7_ - _tmp8_) - 1;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp9_ = t;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			y = _tmp9_;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1855 "page.c"
-		}
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1859 "page.c"
-		{
-			gint t = 0;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp10_ = x;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			t = _tmp10_;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp11_ = y;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			x = _tmp11_;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp12_ = self->priv->_scan_height;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp13_ = t;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			y = (_tmp12_ - _tmp13_) - 1;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1882 "page.c"
-		}
-		default:
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		break;
-#line 1887 "page.c"
-	}
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp14_ = self->priv->_rowstride;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp15_ = y;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	line_offset = _tmp14_ * _tmp15_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp17_ = self->priv->_depth;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp17_ == 8) {
-#line 1899 "page.c"
-		gint _tmp18_ = 0;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp18_ = self->priv->_n_channels;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp16_ = _tmp18_ == 3;
-#line 1905 "page.c"
-	} else {
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp16_ = FALSE;
-#line 1909 "page.c"
-	}
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp16_) {
-#line 1913 "page.c"
-		gint o = 0;
-		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
-		gint _tmp21_ = 0;
-		guchar* _tmp22_ = NULL;
-		gint _tmp22__length1 = 0;
-		gint _tmp23_ = 0;
-		guchar* _tmp24_ = NULL;
-		gint _tmp24__length1 = 0;
-		gint _tmp25_ = 0;
-		guchar _tmp26_ = '\0';
-		guchar _tmp27_ = '\0';
-		guchar* _tmp28_ = NULL;
-		gint _tmp28__length1 = 0;
-		gint _tmp29_ = 0;
-		guchar* _tmp30_ = NULL;
-		gint _tmp30__length1 = 0;
-		gint _tmp31_ = 0;
-		guchar _tmp32_ = '\0';
-		guchar _tmp33_ = '\0';
-		guchar* _tmp34_ = NULL;
-		gint _tmp34__length1 = 0;
-		gint _tmp35_ = 0;
-		guchar* _tmp36_ = NULL;
-		gint _tmp36__length1 = 0;
-		gint _tmp37_ = 0;
-		guchar _tmp38_ = '\0';
-		guchar _tmp39_ = '\0';
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp19_ = line_offset;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp20_ = x;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp21_ = self->priv->_n_channels;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		o = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_ = pixel;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22__length1 = pixel_length1;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23_ = offset;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_ = self->priv->pixels;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24__length1 = self->priv->pixels_length1;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25_ = o;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp26_ = _tmp24_[_tmp25_];
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_[_tmp23_ + 0] = _tmp26_;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp27_ = _tmp22_[_tmp23_ + 0];
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp28_ = pixel;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp28__length1 = pixel_length1;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp29_ = offset;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp30_ = self->priv->pixels;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp30__length1 = self->priv->pixels_length1;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp31_ = o;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp32_ = _tmp30_[_tmp31_ + 1];
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp28_[_tmp29_ + 1] = _tmp32_;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp33_ = _tmp28_[_tmp29_ + 1];
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp34_ = pixel;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp34__length1 = pixel_length1;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp35_ = offset;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp36_ = self->priv->pixels;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp36__length1 = self->priv->pixels_length1;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp37_ = o;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp38_ = _tmp36_[_tmp37_ + 2];
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp34_[_tmp35_ + 2] = _tmp38_;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp39_ = _tmp34_[_tmp35_ + 2];
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return;
-#line 2006 "page.c"
-	} else {
-		gboolean _tmp40_ = FALSE;
-		gint _tmp41_ = 0;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp41_ = self->priv->_depth;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp41_ == 8) {
-#line 2014 "page.c"
-			gint _tmp42_ = 0;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp42_ = self->priv->_n_channels;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp40_ = _tmp42_ == 1;
-#line 2020 "page.c"
-		} else {
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp40_ = FALSE;
-#line 2024 "page.c"
-		}
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp40_) {
-#line 2028 "page.c"
-			guchar p = '\0';
-			guchar* _tmp43_ = NULL;
-			gint _tmp43__length1 = 0;
-			gint _tmp44_ = 0;
-			gint _tmp45_ = 0;
-			guchar _tmp46_ = '\0';
-			guchar* _tmp47_ = NULL;
-			gint _tmp47__length1 = 0;
-			gint _tmp48_ = 0;
-			guchar* _tmp49_ = NULL;
-			gint _tmp49__length1 = 0;
-			gint _tmp50_ = 0;
-			guchar* _tmp51_ = NULL;
-			gint _tmp51__length1 = 0;
-			gint _tmp52_ = 0;
-			guchar _tmp53_ = '\0';
-			guchar _tmp54_ = '\0';
-			guchar _tmp55_ = '\0';
-			guchar _tmp56_ = '\0';
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp43_ = self->priv->pixels;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp43__length1 = self->priv->pixels_length1;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp44_ = line_offset;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp45_ = x;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp46_ = _tmp43_[_tmp44_ + _tmp45_];
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			p = _tmp46_;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp47_ = pixel;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp47__length1 = pixel_length1;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp48_ = offset;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp49_ = pixel;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp49__length1 = pixel_length1;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp50_ = offset;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp51_ = pixel;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp51__length1 = pixel_length1;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp52_ = offset;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp53_ = p;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp51_[_tmp52_ + 2] = _tmp53_;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp54_ = _tmp51_[_tmp52_ + 2];
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp49_[_tmp50_ + 1] = _tmp54_;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp55_ = _tmp49_[_tmp50_ + 1];
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp47_[_tmp48_ + 0] = _tmp55_;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp56_ = _tmp47_[_tmp48_ + 0];
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			return;
-#line 2094 "page.c"
-		} else {
-			gboolean _tmp57_ = FALSE;
-			gint _tmp58_ = 0;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp58_ = self->priv->_depth;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (_tmp58_ == 1) {
-#line 2102 "page.c"
-				gint _tmp59_ = 0;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp59_ = self->priv->_n_channels;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp57_ = _tmp59_ == 1;
-#line 2108 "page.c"
-			} else {
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp57_ = FALSE;
-#line 2112 "page.c"
-			}
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (_tmp57_) {
-#line 2116 "page.c"
-				guchar p = '\0';
-				guchar* _tmp60_ = NULL;
-				gint _tmp60__length1 = 0;
-				gint _tmp61_ = 0;
-				gint _tmp62_ = 0;
-				guchar _tmp63_ = '\0';
-				gint _tmp64_ = 0;
-				guchar _tmp65_ = '\0';
-				gint _tmp66_ = 0;
-				guchar* _tmp67_ = NULL;
-				gint _tmp67__length1 = 0;
-				gint _tmp68_ = 0;
-				guchar* _tmp69_ = NULL;
-				gint _tmp69__length1 = 0;
-				gint _tmp70_ = 0;
-				guchar* _tmp71_ = NULL;
-				gint _tmp71__length1 = 0;
-				gint _tmp72_ = 0;
-				guchar _tmp73_ = '\0';
-				guchar _tmp74_ = '\0';
-				guchar _tmp75_ = '\0';
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60_ = self->priv->pixels;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60__length1 = self->priv->pixels_length1;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp61_ = line_offset;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp62_ = x;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp63_ = _tmp60_[_tmp61_ + (_tmp62_ / 8)];
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				p = _tmp63_;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp65_ = p;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp66_ = x;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (((gint) (_tmp65_ & (0x80 >> (_tmp66_ % 8)))) != 0) {
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp64_ = 0x00;
-#line 2158 "page.c"
-				} else {
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp64_ = 0xFF;
-#line 2162 "page.c"
-				}
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp67_ = pixel;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp67__length1 = pixel_length1;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp68_ = offset;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp69_ = pixel;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp69__length1 = pixel_length1;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp70_ = offset;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp71_ = pixel;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp71__length1 = pixel_length1;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp72_ = offset;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp71_[_tmp72_ + 2] = (guchar) _tmp64_;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp73_ = _tmp71_[_tmp72_ + 2];
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp69_[_tmp70_ + 1] = _tmp73_;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp74_ = _tmp69_[_tmp70_ + 1];
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp67_[_tmp68_ + 0] = _tmp74_;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp75_ = _tmp67_[_tmp68_ + 0];
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				return;
-#line 2196 "page.c"
-			} else {
-				gboolean _tmp76_ = FALSE;
-				gint _tmp77_ = 0;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp77_ = self->priv->_depth;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (_tmp77_ == 2) {
-#line 2204 "page.c"
-					gint _tmp78_ = 0;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp78_ = self->priv->_n_channels;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp76_ = _tmp78_ == 1;
-#line 2210 "page.c"
-				} else {
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp76_ = FALSE;
-#line 2214 "page.c"
-				}
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (_tmp76_) {
-#line 2218 "page.c"
-					gint block_shift[4] = {0};
-					gint _tmp79_[4] = {0};
-					guchar p = '\0';
-					guchar* _tmp80_ = NULL;
-					gint _tmp80__length1 = 0;
-					gint _tmp81_ = 0;
-					gint _tmp82_ = 0;
-					guchar _tmp83_ = '\0';
-					gint sample = 0;
-					guchar _tmp84_ = '\0';
-					gint _tmp85_ = 0;
-					gint _tmp86_ = 0;
-					gint _tmp87_ = 0;
-					guchar* _tmp88_ = NULL;
-					gint _tmp88__length1 = 0;
-					gint _tmp89_ = 0;
-					guchar* _tmp90_ = NULL;
-					gint _tmp90__length1 = 0;
-					gint _tmp91_ = 0;
-					guchar* _tmp92_ = NULL;
-					gint _tmp92__length1 = 0;
-					gint _tmp93_ = 0;
-					gint _tmp94_ = 0;
-					guchar _tmp95_ = '\0';
-					guchar _tmp96_ = '\0';
-					guchar _tmp97_ = '\0';
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp79_[0] = 6;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp79_[1] = 4;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp79_[2] = 2;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp79_[3] = 0;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					memcpy (block_shift, _tmp79_, 4 * sizeof (gint));
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp80_ = self->priv->pixels;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp80__length1 = self->priv->pixels_length1;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp81_ = line_offset;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp82_ = x;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp83_ = _tmp80_[_tmp81_ + (_tmp82_ / 4)];
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					p = _tmp83_;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp84_ = p;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp85_ = x;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp86_ = block_shift[_tmp85_ % 4];
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					sample = (_tmp84_ >> _tmp86_) & 0x3;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp87_ = sample;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					sample = (_tmp87_ * 255) / 3;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp88_ = pixel;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp88__length1 = pixel_length1;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp89_ = offset;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp90_ = pixel;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp90__length1 = pixel_length1;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp91_ = offset;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp92_ = pixel;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp92__length1 = pixel_length1;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp93_ = offset;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp94_ = sample;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp92_[_tmp93_ + 2] = (guchar) _tmp94_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp95_ = _tmp92_[_tmp93_ + 2];
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp90_[_tmp91_ + 1] = _tmp95_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp96_ = _tmp90_[_tmp91_ + 1];
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp88_[_tmp89_ + 0] = _tmp96_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp97_ = _tmp88_[_tmp89_ + 0];
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					return;
-#line 2313 "page.c"
-				}
-			}
-		}
-	}
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp98_ = pixel;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp98__length1 = pixel_length1;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp99_ = offset;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp100_ = self->priv->pixels;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp100__length1 = self->priv->pixels_length1;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp101_ = line_offset;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp102_ = x;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp103_ = self->priv->_depth;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp104_ = self->priv->_n_channels;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp105_ = page_get_sample (self, _tmp100_, _tmp100__length1, _tmp101_, _tmp102_, _tmp103_, _tmp104_, 0);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp98_[_tmp99_ + 0] = _tmp105_;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp106_ = _tmp98_[_tmp99_ + 0];
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp107_ = pixel;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp107__length1 = pixel_length1;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp108_ = offset;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp109_ = self->priv->pixels;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp109__length1 = self->priv->pixels_length1;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp110_ = line_offset;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp111_ = x;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp112_ = self->priv->_depth;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp113_ = self->priv->_n_channels;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp114_ = page_get_sample (self, _tmp109_, _tmp109__length1, _tmp110_, _tmp111_, _tmp112_, _tmp113_, 1);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp107_[_tmp108_ + 1] = _tmp114_;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp115_ = _tmp107_[_tmp108_ + 1];
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp116_ = pixel;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp116__length1 = pixel_length1;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp117_ = offset;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp118_ = self->priv->pixels;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp118__length1 = self->priv->pixels_length1;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp119_ = line_offset;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp120_ = x;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp121_ = self->priv->_depth;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp122_ = self->priv->_n_channels;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp123_ = page_get_sample (self, _tmp118_, _tmp118__length1, _tmp119_, _tmp120_, _tmp121_, _tmp122_, 2);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp116_[_tmp117_ + 2] = _tmp123_;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp124_ = _tmp116_[_tmp117_ + 2];
-#line 2390 "page.c"
-}
-
-
-GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
-	GdkPixbuf* result = NULL;
-	gint l = 0;
-	gint r = 0;
-	gint t = 0;
-	gint b = 0;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GdkPixbuf* image = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	GdkPixbuf* _tmp29_ = NULL;
-	guint8* image_pixels = NULL;
-	GdkPixbuf* _tmp30_ = NULL;
-	guint8* _tmp31_ = NULL;
-	gint image_pixels_length1 = 0;
-	gint _image_pixels_size_ = 0;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = apply_crop;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp1_) {
-#line 2419 "page.c"
-		gboolean _tmp2_ = FALSE;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = self->priv->_has_crop;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = _tmp2_;
-#line 2425 "page.c"
-	} else {
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = FALSE;
-#line 2429 "page.c"
-	}
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp0_) {
-#line 2433 "page.c"
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		gint _tmp18_ = 0;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = self->priv->_crop_x;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		l = _tmp3_;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = l;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->_crop_width;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		r = _tmp4_ + _tmp5_;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_crop_y;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		t = _tmp6_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = t;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = self->priv->_crop_height;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		b = _tmp7_ + _tmp8_;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = l;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp9_ < 0) {
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			l = 0;
-#line 2474 "page.c"
-		}
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp10_ = r;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = page_get_width (self);
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp12_ = _tmp11_;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp10_ > _tmp12_) {
-#line 2484 "page.c"
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp13_ = page_get_width (self);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp14_ = _tmp13_;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			r = _tmp14_;
-#line 2493 "page.c"
-		}
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp15_ = t;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp15_ < 0) {
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			t = 0;
-#line 2501 "page.c"
-		}
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp16_ = b;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp17_ = page_get_height (self);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp18_ = _tmp17_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp16_ > _tmp18_) {
-#line 2511 "page.c"
-			gint _tmp19_ = 0;
-			gint _tmp20_ = 0;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp19_ = page_get_height (self);
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp20_ = _tmp19_;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			b = _tmp20_;
-#line 2520 "page.c"
-		}
-	} else {
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		l = 0;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp21_ = page_get_width (self);
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_ = _tmp21_;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		r = _tmp22_;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		t = 0;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23_ = page_get_height (self);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_ = _tmp23_;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		b = _tmp24_;
-#line 2543 "page.c"
-	}
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp25_ = r;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp26_ = l;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp27_ = b;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp28_ = t;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp29_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp25_ - _tmp26_, _tmp27_ - _tmp28_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	image = _tmp29_;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp30_ = image;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp31_ = gdk_pixbuf_get_pixels (_tmp30_);
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	image_pixels = _tmp31_;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	image_pixels_length1 = -1;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_image_pixels_size_ = image_pixels_length1;
-#line 2567 "page.c"
-	{
-		gint y = 0;
-		gint _tmp32_ = 0;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp32_ = t;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		y = _tmp32_;
-#line 2575 "page.c"
-		{
-			gboolean _tmp33_ = FALSE;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp33_ = TRUE;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			while (TRUE) {
-#line 2582 "page.c"
-				gint _tmp35_ = 0;
-				gint _tmp36_ = 0;
-				gint offset = 0;
-				GdkPixbuf* _tmp37_ = NULL;
-				gint _tmp38_ = 0;
-				gint _tmp39_ = 0;
-				gint _tmp40_ = 0;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!_tmp33_) {
-#line 2592 "page.c"
-					gint _tmp34_ = 0;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp34_ = y;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					y = _tmp34_ + 1;
-#line 2598 "page.c"
-				}
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp33_ = FALSE;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp35_ = y;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp36_ = b;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!(_tmp35_ < _tmp36_)) {
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					break;
-#line 2610 "page.c"
-				}
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp37_ = image;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp38_ = gdk_pixbuf_get_rowstride (_tmp37_);
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp39_ = y;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp40_ = t;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				offset = _tmp38_ * (_tmp39_ - _tmp40_);
-#line 2622 "page.c"
-				{
-					gint x = 0;
-					gint _tmp41_ = 0;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp41_ = l;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					x = _tmp41_;
-#line 2630 "page.c"
-					{
-						gboolean _tmp42_ = FALSE;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-						_tmp42_ = TRUE;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-						while (TRUE) {
-#line 2637 "page.c"
-							gint _tmp44_ = 0;
-							gint _tmp45_ = 0;
-							gint _tmp46_ = 0;
-							gint _tmp47_ = 0;
-							guint8* _tmp48_ = NULL;
-							gint _tmp48__length1 = 0;
-							gint _tmp49_ = 0;
-							gint _tmp50_ = 0;
-							gint _tmp51_ = 0;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							if (!_tmp42_) {
-#line 2649 "page.c"
-								gint _tmp43_ = 0;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-								_tmp43_ = x;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-								x = _tmp43_ + 1;
-#line 2655 "page.c"
-							}
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp42_ = FALSE;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp44_ = x;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp45_ = r;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							if (!(_tmp44_ < _tmp45_)) {
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-								break;
-#line 2667 "page.c"
-							}
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp46_ = x;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp47_ = y;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp48_ = image_pixels;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp48__length1 = image_pixels_length1;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp49_ = offset;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp50_ = x;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp51_ = l;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							page_get_pixel (self, _tmp46_, _tmp47_, _tmp48_, _tmp48__length1, _tmp49_ + ((_tmp50_ - _tmp51_) * 3));
-#line 2685 "page.c"
-						}
-					}
-				}
-			}
-		}
-	}
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = image;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 2696 "page.c"
-}
-
-
-static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	gint _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gchar* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-#line 1405 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result__length1 = _tmp1_ + 1;
-#line 1406 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	__result__size_ = _result__length1;
-#line 1407 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = _result__length1;
-#line 1407 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result__length1 = _tmp3_ - 1;
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp4_ = _result_;
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp4__length1 = _result__length1;
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp5_ = strlen (self);
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp6_ = _tmp5_;
-#line 1408 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp7_ = _result_;
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp7__length1 = _result__length1;
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (result_length1) {
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		*result_length1 = _tmp7__length1;
-#line 2751 "page.c"
-	}
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp7_;
-#line 1409 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 2757 "page.c"
-}
-
-
-static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_filename) {
-	gchar* result = NULL;
-	gchar* contents = NULL;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-	guchar* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (icc_profile_filename != NULL, NULL);
-#line 2776 "page.c"
-	{
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = icc_profile_filename;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_file_get_contents (_tmp0_, &_tmp1_, NULL, &_inner_error_);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_g_free0 (contents);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		contents = _tmp1_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2790 "page.c"
-			goto __catch3_g_error;
-		}
-	}
-	goto __finally3;
-	__catch3_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		e = _inner_error_;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_inner_error_ = NULL;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = e;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = _tmp2_->message;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_warning ("page.vala:637: failed to get icc profile data: %s", _tmp3_);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = NULL;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_g_error_free0 (e);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_g_free0 (contents);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return result;
-#line 2818 "page.c"
-	}
-	__finally3:
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_g_free0 (contents);
-#line 631 "/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 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_clear_error (&_inner_error_);
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return NULL;
-#line 2831 "page.c"
-	}
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = contents;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp6_ = string_to_utf8 (_tmp4_, &_tmp5_);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = (guchar*) _tmp6_;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7__length1 = (_tmp5_ * sizeof (gchar)) / sizeof (guchar);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = g_base64_encode (_tmp7_, (_tmp5_ * sizeof (gchar)) / sizeof (guchar));
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9_ = _tmp8_;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = (g_free (_tmp7_), NULL);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp9_;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (contents);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 2853 "page.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 2860 "page.c"
-}
-
-
-void page_copy_to_clipboard (Page* self, GtkWindow* window) {
-	GdkDisplay* display = NULL;
-	GtkWindow* _tmp0_ = NULL;
-	GdkDisplay* _tmp1_ = NULL;
-	GdkDisplay* _tmp2_ = NULL;
-	GtkClipboard* clipboard = NULL;
-	GtkClipboard* _tmp3_ = NULL;
-	GtkClipboard* _tmp4_ = NULL;
-	GdkPixbuf* image = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (window != NULL);
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = window;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = gtk_widget_get_display ((GtkWidget*) _tmp0_);
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	display = _tmp2_;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	clipboard = _tmp4_;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = page_get_image (self, TRUE);
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	image = _tmp5_;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	gtk_clipboard_set_image (clipboard, image);
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_object_unref0 (image);
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_object_unref0 (clipboard);
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_object_unref0 (display);
-#line 2904 "page.c"
-}
-
-
-void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error) {
-	GFileOutputStream* stream = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileOutputStream* _tmp1_ = NULL;
-	PixbufWriter* writer = NULL;
-	GFileOutputStream* _tmp2_ = NULL;
-	PixbufWriter* _tmp3_ = NULL;
-	GdkPixbuf* image = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	gchar* icc_profile_data = NULL;
-	const gchar* _tmp5_ = NULL;
-	GCompareFunc _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	GError * _inner_error_ = NULL;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (type != NULL);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (file != NULL);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = file;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	stream = _tmp1_;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_propagate_error (error, _inner_error_);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return;
-#line 2941 "page.c"
-	}
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = stream;
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = pixbuf_writer_new (_tmp2_);
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	writer = _tmp3_;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = page_get_image (self, TRUE);
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	image = _tmp4_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	icc_profile_data = NULL;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = self->priv->_color_profile;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp5_ != NULL) {
-#line 2959 "page.c"
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_color_profile;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = page_get_icc_data_encoded (self, _tmp6_);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_g_free0 (icc_profile_data);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		icc_profile_data = _tmp7_;
-#line 2970 "page.c"
-	}
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = g_strcmp0;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9_ = type;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp10_ = _tmp8_ (_tmp9_, "jpeg");
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp10_ == 0) {
-#line 2980 "page.c"
-		gchar** keys = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar** _tmp15_ = NULL;
-		gint keys_length1 = 0;
-		gint _keys_size_ = 0;
-		gchar** values = NULL;
-		gint _tmp16_ = 0;
-		gchar* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gchar* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		gchar* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gchar** _tmp24_ = NULL;
-		gint values_length1 = 0;
-		gint _values_size_ = 0;
-		const gchar* _tmp25_ = NULL;
-		PixbufWriter* _tmp28_ = NULL;
-		GdkPixbuf* _tmp29_ = NULL;
-		gchar** _tmp30_ = NULL;
-		gint _tmp30__length1 = 0;
-		gchar** _tmp31_ = NULL;
-		gint _tmp31__length1 = 0;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = g_strdup ("x-dpi");
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp12_ = g_strdup ("y-dpi");
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp13_ = g_strdup ("quality");
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp14_ = g_strdup ("icc-profile");
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp15_ = g_new0 (gchar*, 5 + 1);
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp15_[0] = _tmp11_;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp15_[1] = _tmp12_;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp15_[2] = _tmp13_;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp15_[3] = _tmp14_;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp15_[4] = NULL;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		keys = _tmp15_;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		keys_length1 = 5;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_keys_size_ = keys_length1;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp16_ = self->priv->_dpi;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp17_ = g_strdup_printf ("%d", _tmp16_);
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp18_ = self->priv->_dpi;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp19_ = g_strdup_printf ("%d", _tmp18_);
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp20_ = quality;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp21_ = g_strdup_printf ("%d", _tmp20_);
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_ = icc_profile_data;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23_ = g_strdup (_tmp22_);
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_ = g_new0 (gchar*, 5 + 1);
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_[0] = _tmp17_;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_[1] = _tmp19_;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_[2] = _tmp21_;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_[3] = _tmp23_;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_[4] = NULL;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		values = _tmp24_;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		values_length1 = 5;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_values_size_ = values_length1;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25_ = icc_profile_data;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp25_ == NULL) {
-#line 3072 "page.c"
-			gchar** _tmp26_ = NULL;
-			gint _tmp26__length1 = 0;
-			gchar* _tmp27_ = NULL;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp26_ = keys;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp26__length1 = keys_length1;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_g_free0 (_tmp26_[3]);
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp26_[3] = NULL;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp27_ = _tmp26_[3];
-#line 3086 "page.c"
-		}
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp28_ = writer;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp29_ = image;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp30_ = keys;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp30__length1 = keys_length1;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp31_ = values;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp31__length1 = values_length1;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		pixbuf_writer_save (_tmp28_, _tmp29_, "jpeg", _tmp30_, _tmp30__length1, _tmp31_, _tmp31__length1, &_inner_error_);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			g_propagate_error (error, _inner_error_);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_g_free0 (icc_profile_data);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_g_object_unref0 (image);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_pixbuf_writer_unref0 (writer);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_g_object_unref0 (stream);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			return;
-#line 3120 "page.c"
-		}
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 3126 "page.c"
-	} else {
-		GCompareFunc _tmp32_ = NULL;
-		const gchar* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp32_ = g_strcmp0;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp33_ = type;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp34_ = _tmp32_ (_tmp33_, "png");
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp34_ == 0) {
-#line 3139 "page.c"
-			gchar** keys = NULL;
-			gchar* _tmp35_ = NULL;
-			gchar* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
-			gchar** _tmp38_ = NULL;
-			gint keys_length1 = 0;
-			gint _keys_size_ = 0;
-			gchar** values = NULL;
-			gint _tmp39_ = 0;
-			gchar* _tmp40_ = NULL;
-			gint _tmp41_ = 0;
-			gchar* _tmp42_ = NULL;
-			const gchar* _tmp43_ = NULL;
-			gchar* _tmp44_ = NULL;
-			gchar** _tmp45_ = NULL;
-			gint values_length1 = 0;
-			gint _values_size_ = 0;
-			const gchar* _tmp46_ = NULL;
-			PixbufWriter* _tmp49_ = NULL;
-			GdkPixbuf* _tmp50_ = NULL;
-			gchar** _tmp51_ = NULL;
-			gint _tmp51__length1 = 0;
-			gchar** _tmp52_ = NULL;
-			gint _tmp52__length1 = 0;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp35_ = g_strdup ("x-dpi");
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp36_ = g_strdup ("y-dpi");
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp37_ = g_strdup ("icc-profile");
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp38_ = g_new0 (gchar*, 4 + 1);
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp38_[0] = _tmp35_;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp38_[1] = _tmp36_;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp38_[2] = _tmp37_;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp38_[3] = NULL;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			keys = _tmp38_;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			keys_length1 = 4;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_keys_size_ = keys_length1;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp39_ = self->priv->_dpi;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp40_ = g_strdup_printf ("%d", _tmp39_);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp41_ = self->priv->_dpi;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp42_ = g_strdup_printf ("%d", _tmp41_);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp43_ = icc_profile_data;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp44_ = g_strdup (_tmp43_);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp45_ = g_new0 (gchar*, 4 + 1);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp45_[0] = _tmp40_;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp45_[1] = _tmp42_;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp45_[2] = _tmp44_;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp45_[3] = NULL;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			values = _tmp45_;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			values_length1 = 4;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_values_size_ = values_length1;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp46_ = icc_profile_data;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (_tmp46_ == NULL) {
-#line 3218 "page.c"
-				gchar** _tmp47_ = NULL;
-				gint _tmp47__length1 = 0;
-				gchar* _tmp48_ = NULL;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp47_ = keys;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp47__length1 = keys_length1;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_g_free0 (_tmp47_[2]);
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp47_[2] = NULL;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp48_ = _tmp47_[2];
-#line 3232 "page.c"
-			}
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp49_ = writer;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp50_ = image;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp51_ = keys;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp51__length1 = keys_length1;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp52_ = values;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp52__length1 = values_length1;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			pixbuf_writer_save (_tmp49_, _tmp50_, "png", _tmp51_, _tmp51__length1, _tmp52_, _tmp52__length1, &_inner_error_);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				g_propagate_error (error, _inner_error_);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_g_free0 (icc_profile_data);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_g_object_unref0 (image);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_pixbuf_writer_unref0 (writer);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_g_object_unref0 (stream);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				return;
-#line 3266 "page.c"
-			}
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 3272 "page.c"
-		} else {
-			GCompareFunc _tmp53_ = NULL;
-			const gchar* _tmp54_ = NULL;
-			gint _tmp55_ = 0;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp53_ = g_strcmp0;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp54_ = type;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp55_ = _tmp53_ (_tmp54_, "tiff");
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (_tmp55_ == 0) {
-#line 3285 "page.c"
-				gchar** keys = NULL;
-				gchar* _tmp56_ = NULL;
-				gchar* _tmp57_ = NULL;
-				gchar* _tmp58_ = NULL;
-				gchar* _tmp59_ = NULL;
-				gchar** _tmp60_ = NULL;
-				gint keys_length1 = 0;
-				gint _keys_size_ = 0;
-				gchar** values = NULL;
-				gint _tmp61_ = 0;
-				gchar* _tmp62_ = NULL;
-				gint _tmp63_ = 0;
-				gchar* _tmp64_ = NULL;
-				gchar* _tmp65_ = NULL;
-				const gchar* _tmp66_ = NULL;
-				gchar* _tmp67_ = NULL;
-				gchar** _tmp68_ = NULL;
-				gint values_length1 = 0;
-				gint _values_size_ = 0;
-				const gchar* _tmp69_ = NULL;
-				PixbufWriter* _tmp72_ = NULL;
-				GdkPixbuf* _tmp73_ = NULL;
-				gchar** _tmp74_ = NULL;
-				gint _tmp74__length1 = 0;
-				gchar** _tmp75_ = NULL;
-				gint _tmp75__length1 = 0;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp56_ = g_strdup ("x-dpi");
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp57_ = g_strdup ("y-dpi");
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp58_ = g_strdup ("compression");
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp59_ = g_strdup ("icc-profile");
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60_ = g_new0 (gchar*, 5 + 1);
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60_[0] = _tmp56_;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60_[1] = _tmp57_;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60_[2] = _tmp58_;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60_[3] = _tmp59_;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60_[4] = NULL;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				keys = _tmp60_;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				keys_length1 = 5;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_keys_size_ = keys_length1;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp61_ = self->priv->_dpi;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp62_ = g_strdup_printf ("%d", _tmp61_);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp63_ = self->priv->_dpi;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp64_ = g_strdup_printf ("%d", _tmp63_);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp65_ = g_strdup ("8");
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp66_ = icc_profile_data;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp67_ = g_strdup (_tmp66_);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp68_ = g_new0 (gchar*, 5 + 1);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp68_[0] = _tmp62_;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp68_[1] = _tmp64_;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp68_[2] = _tmp65_;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp68_[3] = _tmp67_;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp68_[4] = NULL;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				values = _tmp68_;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				values_length1 = 5;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_values_size_ = values_length1;
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp69_ = icc_profile_data;
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (_tmp69_ == NULL) {
-#line 3374 "page.c"
-					gchar** _tmp70_ = NULL;
-					gint _tmp70__length1 = 0;
-					gchar* _tmp71_ = NULL;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp70_ = keys;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp70__length1 = keys_length1;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_g_free0 (_tmp70_[3]);
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp70_[3] = NULL;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp71_ = _tmp70_[3];
-#line 3388 "page.c"
-				}
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp72_ = writer;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp73_ = image;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp74_ = keys;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp74__length1 = keys_length1;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp75_ = values;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp75__length1 = values_length1;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				pixbuf_writer_save (_tmp72_, _tmp73_, "tiff", _tmp74_, _tmp74__length1, _tmp75_, _tmp75__length1, &_inner_error_);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					g_propagate_error (error, _inner_error_);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_g_free0 (icc_profile_data);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_g_object_unref0 (image);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_pixbuf_writer_unref0 (writer);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_g_object_unref0 (stream);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					return;
-#line 3422 "page.c"
-				}
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 3428 "page.c"
-			} else {
-				const gchar* _tmp76_ = NULL;
-				gchar* _tmp77_ = NULL;
-				gchar* _tmp78_ = NULL;
-				GError* _tmp79_ = NULL;
-				GError* _tmp80_ = NULL;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp76_ = type;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp77_ = g_strdup_printf ("Unknown file type: %s", _tmp76_);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp78_ = _tmp77_;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp79_ = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_INVAL, _tmp78_);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp80_ = _tmp79_;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_g_free0 (_tmp78_);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_inner_error_ = _tmp80_;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				g_propagate_error (error, _inner_error_);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_g_free0 (icc_profile_data);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_g_object_unref0 (image);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_pixbuf_writer_unref0 (writer);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_g_object_unref0 (stream);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				return;
-#line 3461 "page.c"
-			}
-		}
-	}
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (icc_profile_data);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_object_unref0 (image);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_pixbuf_writer_unref0 (writer);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_object_unref0 (stream);
-#line 3473 "page.c"
-}
-
-
-gint page_get_width (Page* self) {
-	gint result;
-	gboolean _tmp0_ = FALSE;
-	ScanDirection _tmp1_ = 0;
-	ScanDirection _tmp2_ = 0;
-#line 25 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = page_get_scan_direction (self);
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = _tmp1_;
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = TRUE;
-#line 3492 "page.c"
-	} else {
-		ScanDirection _tmp3_ = 0;
-		ScanDirection _tmp4_ = 0;
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = page_get_scan_direction (self);
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = _tmp3_;
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 3502 "page.c"
-	}
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp0_) {
-#line 3506 "page.c"
-		gint _tmp5_ = 0;
-#line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->_scan_width;
-#line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp5_;
-#line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return result;
-#line 3514 "page.c"
-	} else {
-		gint _tmp6_ = 0;
-#line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_scan_height;
-#line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp6_;
-#line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return result;
-#line 3523 "page.c"
-	}
-}
-
-
-gint page_get_height (Page* self) {
-	gint result;
-	gboolean _tmp0_ = FALSE;
-	ScanDirection _tmp1_ = 0;
-	ScanDirection _tmp2_ = 0;
-#line 37 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = page_get_scan_direction (self);
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = _tmp1_;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = TRUE;
-#line 3543 "page.c"
-	} else {
-		ScanDirection _tmp3_ = 0;
-		ScanDirection _tmp4_ = 0;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = page_get_scan_direction (self);
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = _tmp3_;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 3553 "page.c"
-	}
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp0_) {
-#line 3557 "page.c"
-		gint _tmp5_ = 0;
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->_scan_height;
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp5_;
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return result;
-#line 3565 "page.c"
-	} else {
-		gint _tmp6_ = 0;
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_scan_width;
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp6_;
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return result;
-#line 3574 "page.c"
-	}
-}
-
-
-gboolean page_get_is_landscape (Page* self) {
-	gboolean result;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = page_get_width (self);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = _tmp0_;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = page_get_height (self);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = _tmp2_;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp1_ > _tmp3_;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3599 "page.c"
-}
-
-
-gint page_get_dpi (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_dpi;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3614 "page.c"
-}
-
-
-static void page_set_dpi (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_dpi = _tmp0_;
-#line 3626 "page.c"
-}
-
-
-gint page_get_depth (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_depth;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3641 "page.c"
-}
-
-
-static void page_set_depth (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_depth = _tmp0_;
-#line 3653 "page.c"
-}
-
-
-const gchar* page_get_color_profile (Page* self) {
-	const gchar* result;
-	const gchar* _tmp0_ = NULL;
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_color_profile;
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3668 "page.c"
-}
-
-
-void page_set_color_profile (Page* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (self->priv->_color_profile);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_color_profile = _tmp1_;
-#line 3685 "page.c"
-}
-
-
-gint page_get_scan_width (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_scan_width;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3700 "page.c"
-}
-
-
-static void page_set_scan_width (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_scan_width = _tmp0_;
-#line 3712 "page.c"
-}
-
-
-gint page_get_scan_height (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_scan_height;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3727 "page.c"
-}
-
-
-static void page_set_scan_height (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_scan_height = _tmp0_;
-#line 3739 "page.c"
-}
-
-
-gint page_get_rowstride (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_rowstride;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3754 "page.c"
-}
-
-
-static void page_set_rowstride (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_rowstride = _tmp0_;
-#line 3766 "page.c"
-}
-
-
-gint page_get_n_channels (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_n_channels;
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3781 "page.c"
-}
-
-
-static void page_set_n_channels (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_n_channels = _tmp0_;
-#line 3793 "page.c"
-}
-
-
-gboolean page_get_is_scanning (Page* self) {
-	gboolean result;
-	gboolean _tmp0_ = FALSE;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_is_scanning;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3808 "page.c"
-}
-
-
-static void page_set_is_scanning (Page* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_is_scanning = _tmp0_;
-#line 3820 "page.c"
-}
-
-
-gboolean page_get_has_data (Page* self) {
-	gboolean result;
-	gboolean _tmp0_ = FALSE;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_has_data;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3835 "page.c"
-}
-
-
-static void page_set_has_data (Page* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_has_data = _tmp0_;
-#line 3847 "page.c"
-}
-
-
-gint page_get_scan_line (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_scan_line;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3862 "page.c"
-}
-
-
-static void page_set_scan_line (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_scan_line = _tmp0_;
-#line 3874 "page.c"
-}
-
-
-gboolean page_get_is_color (Page* self) {
-	gboolean result;
-	gint _tmp0_ = 0;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_n_channels;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_ > 1;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3889 "page.c"
-}
-
-
-ScanDirection page_get_scan_direction (Page* self) {
-	ScanDirection result;
-	ScanDirection _tmp0_ = 0;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->scan_direction_;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 3904 "page.c"
-}
-
-
-void page_set_scan_direction (Page* self, ScanDirection value) {
-	ScanDirection _tmp0_ = 0;
-	ScanDirection _tmp1_ = 0;
-	gboolean size_has_changed = FALSE;
-	gint left_steps = 0;
-	ScanDirection _tmp2_ = 0;
-	ScanDirection _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
-	ScanDirection _tmp35_ = 0;
-	gboolean _tmp36_ = FALSE;
-	gboolean _tmp37_ = FALSE;
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->scan_direction_;
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = value;
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp0_ == _tmp1_) {
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return;
-#line 3931 "page.c"
-	}
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	size_has_changed = FALSE;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = value;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = self->priv->scan_direction_;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	left_steps = (gint) (_tmp2_ - _tmp3_);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = left_steps;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp4_ < 0) {
-#line 3945 "page.c"
-		gint _tmp5_ = 0;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = left_steps;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		left_steps = _tmp5_ + 4;
-#line 3951 "page.c"
-	}
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp6_ = left_steps;
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp6_ != 2) {
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		size_has_changed = TRUE;
-#line 3959 "page.c"
-	}
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = self->priv->_has_crop;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp7_) {
-#line 3965 "page.c"
-		gint _tmp8_ = 0;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = left_steps;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		switch (_tmp8_) {
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			case 1:
-#line 3973 "page.c"
-			{
-				gint t = 0;
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
-				gint _tmp17_ = 0;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp9_ = self->priv->_crop_x;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				t = _tmp9_;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp10_ = self->priv->_crop_y;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_x (self, _tmp10_);
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp11_ = page_get_width (self);
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp12_ = _tmp11_;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp13_ = t;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp14_ = self->priv->_crop_width;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_y (self, _tmp12_ - (_tmp13_ + _tmp14_));
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp15_ = self->priv->_crop_width;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				t = _tmp15_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp16_ = self->priv->_crop_height;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_width (self, _tmp16_);
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp17_ = t;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_height (self, _tmp17_);
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 4017 "page.c"
-			}
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			case 2:
-#line 4021 "page.c"
-			{
-				gint _tmp18_ = 0;
-				gint _tmp19_ = 0;
-				gint _tmp20_ = 0;
-				gint _tmp21_ = 0;
-				gint _tmp22_ = 0;
-				gint _tmp23_ = 0;
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp18_ = page_get_width (self);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp19_ = _tmp18_;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp20_ = self->priv->_crop_x;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp21_ = self->priv->_crop_width;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_x (self, _tmp19_ - (_tmp20_ + _tmp21_));
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp22_ = page_get_width (self);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp23_ = _tmp22_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp24_ = self->priv->_crop_y;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp25_ = self->priv->_crop_height;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_y (self, _tmp23_ - (_tmp24_ + _tmp25_));
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 4053 "page.c"
-			}
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			case 3:
-#line 4057 "page.c"
-			{
-				gint t = 0;
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
-				gint _tmp32_ = 0;
-				gint _tmp33_ = 0;
-				gint _tmp34_ = 0;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp26_ = self->priv->_crop_y;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				t = _tmp26_;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp27_ = self->priv->_crop_x;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_y (self, _tmp27_);
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp28_ = page_get_height (self);
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp29_ = _tmp28_;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp30_ = t;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp31_ = self->priv->_crop_height;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_x (self, _tmp29_ - (_tmp30_ + _tmp31_));
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp32_ = self->priv->_crop_width;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				t = _tmp32_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp33_ = self->priv->_crop_height;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_width (self, _tmp33_);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp34_ = t;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_set_crop_height (self, _tmp34_);
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 4101 "page.c"
-			}
-			default:
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 4106 "page.c"
-		}
-	}
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp35_ = value;
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->scan_direction_ = _tmp35_;
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp36_ = size_has_changed;
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp36_) {
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_signal_emit_by_name (self, "size-changed");
-#line 4119 "page.c"
-	}
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "scan-direction-changed");
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp37_ = self->priv->_has_crop;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp37_) {
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_signal_emit_by_name (self, "crop-changed");
-#line 4129 "page.c"
-	}
-}
-
-
-gboolean page_get_has_crop (Page* self) {
-	gboolean result;
-	gboolean _tmp0_ = FALSE;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_has_crop;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 4145 "page.c"
-}
-
-
-static void page_set_has_crop (Page* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_has_crop = _tmp0_;
-#line 4157 "page.c"
-}
-
-
-const gchar* page_get_crop_name (Page* self) {
-	const gchar* result;
-	const gchar* _tmp0_ = NULL;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_crop_name;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 4172 "page.c"
-}
-
-
-static void page_set_crop_name (Page* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (self->priv->_crop_name);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_crop_name = _tmp1_;
-#line 4189 "page.c"
-}
-
-
-gint page_get_crop_x (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_crop_x;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 4204 "page.c"
-}
-
-
-static void page_set_crop_x (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_crop_x = _tmp0_;
-#line 4216 "page.c"
-}
-
-
-gint page_get_crop_y (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_crop_y;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 4231 "page.c"
-}
-
-
-static void page_set_crop_y (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_crop_y = _tmp0_;
-#line 4243 "page.c"
-}
-
-
-gint page_get_crop_width (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_crop_width;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 4258 "page.c"
-}
-
-
-static void page_set_crop_width (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_crop_width = _tmp0_;
-#line 4270 "page.c"
-}
-
-
-gint page_get_crop_height (Page* self) {
-	gint result;
-	gint _tmp0_ = 0;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->_crop_height;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 4285 "page.c"
-}
-
-
-static void page_set_crop_height (Page* self, gint value) {
-	gint _tmp0_ = 0;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = value;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_crop_height = _tmp0_;
-#line 4297 "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 4304 "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 4313 "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 4323 "page.c"
-	} else {
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 4327 "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 4335 "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 4342 "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 4349 "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 4353 "page.c"
-		}
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = page_ref (object);
-#line 4357 "page.c"
-	} else {
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = NULL;
-#line 4361 "page.c"
-	}
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return NULL;
-#line 4365 "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 4376 "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 4382 "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 4386 "page.c"
-	} else {
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*object_p = page_ref (value->data[0].v_pointer);
-#line 4390 "page.c"
-	}
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return NULL;
-#line 4394 "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 4408 "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 4417 "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 4437 "page.c"
-	} else {
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = NULL;
-#line 4441 "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 4447 "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 4466 "page.c"
-	} else {
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = NULL;
-#line 4470 "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 4476 "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"
-	((PageClass *) 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 4500 "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 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->ref_count = 1;
-#line 4509 "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 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_handlers_destroy (self);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (self->priv->_color_profile);
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->pixels = (g_free (self->priv->pixels), NULL);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (self->priv->_crop_name);
-#line 4525 "page.c"
-}
-
-
-GType page_get_type (void) {
-	static volatile gsize page_type_id__volatile = 0;
-	if (g_once_init_enter (&page_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_page_init, value_page_free_value, value_page_copy_value, value_page_peek_pointer, "p", value_page_collect_value, "p", value_page_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Page), 0, (GInstanceInitFunc) page_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 page_type_id;
-		page_type_id = g_type_register_fundamental (g_type_fundamental_next (), "Page", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&page_type_id__volatile, page_type_id);
-	}
-	return page_type_id__volatile;
-}
-
-
-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 4550 "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 4563 "page.c"
-	}
-}
-
-
-PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* stream) {
-	PixbufWriter* self = NULL;
-	GFileOutputStream* _tmp0_ = NULL;
-	GFileOutputStream* _tmp1_ = NULL;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (stream != NULL, NULL);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self = (PixbufWriter*) g_type_create_instance (object_type);
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = stream;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_object_unref0 (self->stream);
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->stream = _tmp1_;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return self;
-#line 4586 "page.c"
-}
-
-
-PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) {
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return pixbuf_writer_construct (TYPE_PIXBUF_WRITER, stream);
-#line 4593 "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 ((PixbufWriter*) self, buf, buf_length1, error);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 4602 "page.c"
-}
-
-
-void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type, gchar** option_keys, int option_keys_length1, gchar** option_values, int option_values_length1, GError** error) {
-	GdkPixbuf* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GError * _inner_error_ = NULL;
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (image != NULL);
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (type != NULL);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = image;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = type;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = option_keys;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2__length1 = option_keys_length1;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = option_values;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3__length1 = option_values_length1;
-#line 703 "/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 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_propagate_error (error, _inner_error_);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return;
-#line 4640 "page.c"
-	}
-}
-
-
-static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf, int buf_length1, GError** error) {
-	gboolean result = FALSE;
-	GFileOutputStream* _tmp0_ = NULL;
-	guint8* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	GError * _inner_error_ = NULL;
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->stream;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = buf;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1__length1 = buf_length1;
-#line 708 "/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 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4663 "page.c"
-		gboolean _tmp2_ = FALSE;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_propagate_error (error, _inner_error_);
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return _tmp2_;
-#line 4669 "page.c"
-	}
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = TRUE;
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 4675 "page.c"
-}
-
-
-static void value_pixbuf_writer_init (GValue* value) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	value->data[0].v_pointer = NULL;
-#line 4682 "page.c"
-}
-
-
-static void value_pixbuf_writer_free_value (GValue* value) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (value->data[0].v_pointer) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		pixbuf_writer_unref (value->data[0].v_pointer);
-#line 4691 "page.c"
-	}
-}
-
-
-static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (src_value->data[0].v_pointer) {
-#line 692 "/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 4701 "page.c"
-	} else {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 4705 "page.c"
-	}
-}
-
-
-static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return value->data[0].v_pointer;
-#line 4713 "page.c"
-}
-
-
-static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (collect_values[0].v_pointer) {
-#line 4720 "page.c"
-		PixbufWriter* object;
-		object = collect_values[0].v_pointer;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 692 "/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 4727 "page.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 692 "/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 4731 "page.c"
-		}
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = pixbuf_writer_ref (object);
-#line 4735 "page.c"
-	} else {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = NULL;
-#line 4739 "page.c"
-	}
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return NULL;
-#line 4743 "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 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (!object_p) {
-#line 692 "/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 4754 "page.c"
-	}
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (!value->data[0].v_pointer) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*object_p = NULL;
-#line 4760 "page.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*object_p = value->data[0].v_pointer;
-#line 4764 "page.c"
-	} else {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*object_p = pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4768 "page.c"
-	}
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return NULL;
-#line 4772 "page.c"
-}
-
-
-GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecPixbufWriter* spec;
-#line 692 "/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 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return G_PARAM_SPEC (spec);
-#line 4786 "page.c"
-}
-
-
-gpointer value_get_pixbuf_writer (const GValue* value) {
-#line 692 "/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 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return value->data[0].v_pointer;
-#line 4795 "page.c"
-}
-
-
-void value_set_pixbuf_writer (GValue* value, gpointer v_object) {
-	PixbufWriter* old;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER));
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	old = value->data[0].v_pointer;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (v_object) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXBUF_WRITER));
-#line 692 "/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 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = v_object;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4815 "page.c"
-	} else {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = NULL;
-#line 4819 "page.c"
-	}
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (old) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		pixbuf_writer_unref (old);
-#line 4825 "page.c"
-	}
-}
-
-
-void value_take_pixbuf_writer (GValue* value, gpointer v_object) {
-	PixbufWriter* old;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER));
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	old = value->data[0].v_pointer;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (v_object) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXBUF_WRITER));
-#line 692 "/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 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = v_object;
-#line 4844 "page.c"
-	} else {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		value->data[0].v_pointer = NULL;
-#line 4848 "page.c"
-	}
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (old) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		pixbuf_writer_unref (old);
-#line 4854 "page.c"
-	}
-}
-
-
-static void pixbuf_writer_class_init (PixbufWriterClass * klass) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	pixbuf_writer_parent_class = g_type_class_peek_parent (klass);
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	((PixbufWriterClass *) klass)->finalize = pixbuf_writer_finalize;
-#line 4864 "page.c"
-}
-
-
-static void pixbuf_writer_instance_init (PixbufWriter * self) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->ref_count = 1;
-#line 4871 "page.c"
-}
-
-
-static void pixbuf_writer_finalize (PixbufWriter* obj) {
-	PixbufWriter * self;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_WRITER, PixbufWriter);
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_handlers_destroy (self);
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_object_unref0 (self->stream);
-#line 4883 "page.c"
-}
-
-
-GType pixbuf_writer_get_type (void) {
-	static volatile gsize pixbuf_writer_type_id__volatile = 0;
-	if (g_once_init_enter (&pixbuf_writer_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_pixbuf_writer_init, value_pixbuf_writer_free_value, value_pixbuf_writer_copy_value, value_pixbuf_writer_peek_pointer, "p", value_pixbuf_writer_collect_value, "p", value_pixbuf_writer_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PixbufWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufWriter), 0, (GInstanceInitFunc) pixbuf_writer_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 pixbuf_writer_type_id;
-		pixbuf_writer_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PixbufWriter", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&pixbuf_writer_type_id__volatile, pixbuf_writer_type_id);
-	}
-	return pixbuf_writer_type_id__volatile;
-}
-
-
-gpointer pixbuf_writer_ref (gpointer instance) {
-	PixbufWriter* self;
-	self = instance;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return instance;
-#line 4908 "page.c"
-}
-
-
-void pixbuf_writer_unref (gpointer instance) {
-	PixbufWriter* self;
-	self = instance;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		PIXBUF_WRITER_GET_CLASS (self)->finalize (self);
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 4921 "page.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/page.vala b/src/page.vala
index 9636d0d..582aef8 100644
--- a/src/page.vala
+++ b/src/page.vala
@@ -624,13 +624,16 @@ public class Page
         return image;
     }
 
-    private string? get_icc_data_encoded (string icc_profile_filename)
+    public string? get_icc_data_encoded ()
     {
+        if (color_profile == null)
+            return null;
+
         /* Get binary data */
         string contents;
         try
         {
-            FileUtils.get_contents (icc_profile_filename, out contents);
+            FileUtils.get_contents (color_profile, out contents);
         }
         catch (Error e)
         {
@@ -641,71 +644,33 @@ public class Page
         /* Encode into base64 */
         return Base64.encode ((uchar[]) contents.to_utf8 ());
     }
-    
+
     public void copy_to_clipboard (Gtk.Window window)
-    {        
+    {
         var display = window.get_display ();
         var clipboard = Gtk.Clipboard.get_for_display (display, Gdk.SELECTION_CLIPBOARD);
         var image = get_image (true);
         clipboard.set_image (image);
     }
 
-    public void save (string type, int quality, File file) throws Error
+    public void save_png (File file) throws Error
     {
         var stream = file.replace (null, false, FileCreateFlags.NONE, null);
-        var writer = new PixbufWriter (stream);
         var image = get_image (true);
 
         string? icc_profile_data = null;
         if (color_profile != null)
-            icc_profile_data = get_icc_data_encoded (color_profile);
+            icc_profile_data = get_icc_data_encoded ();
 
-        if (strcmp (type, "jpeg") == 0)
-        {
-            string[] keys = { "x-dpi", "y-dpi", "quality", "icc-profile", null };
-            string[] values = { "%d".printf (dpi), "%d".printf (dpi), "%d".printf (quality), icc_profile_data, null };
-            if (icc_profile_data == null)
-                keys[3] = null;
-            writer.save (image, "jpeg", keys, values);
-        }
-        else if (strcmp (type, "png") == 0)
-        {
-            string[] keys = { "x-dpi", "y-dpi", "icc-profile", null };
-            string[] values = { "%d".printf (dpi), "%d".printf (dpi), icc_profile_data, null };
-            if (icc_profile_data == null)
-                keys[2] = null;
-            writer.save (image, "png", keys, values);
-        }
-        else if (strcmp (type, "tiff") == 0)
-        {
-            string[] keys = { "x-dpi", "y-dpi", "compression", "icc-profile", null };
-            string[] values = { "%d".printf (dpi), "%d".printf (dpi), "8" /* Deflate compression */, icc_profile_data, null };
-            if (icc_profile_data == null)
-                keys[3] = null;
-            writer.save (image, "tiff", keys, values);
-        }
-        else
-            throw new FileError.INVAL ("Unknown file type: %s".printf (type));
-    }
-}
-
-public class PixbufWriter
-{
-    public FileOutputStream stream;
-
-    public PixbufWriter (FileOutputStream stream)
-    {
-        this.stream = stream;
-    }
+        string[] keys = { "x-dpi", "y-dpi", "icc-profile", null };
+        string[] values = { "%d".printf (dpi), "%d".printf (dpi), icc_profile_data, null };
+        if (icc_profile_data == null)
+            keys[2] = null;
 
-    public void save (Gdk.Pixbuf image, string type, string[] option_keys, string[] option_values) throws Error
-    {
-        image.save_to_callbackv (write_pixbuf_data, type, option_keys, option_values);
-    }
-
-    private bool write_pixbuf_data (uint8[] buf) throws Error
-    {
-        stream.write_all (buf, null, null);
-        return true;
+        image.save_to_callbackv ((buf) =>
+        {
+            stream.write_all (buf, null, null);
+            return true;
+        }, "png", keys, values);
     }
 }
diff --git a/src/preferences-dialog.ui b/src/preferences-dialog.ui
new file mode 100644
index 0000000..2272b77
--- /dev/null
+++ b/src/preferences-dialog.ui
@@ -0,0 +1,608 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.10"/>
+  <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="GtkListStore" id="device_model">
+    <columns>
+      <!-- column-name device_name -->
+      <column type="gchararray"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="paper_size_model">
+    <columns>
+      <!-- column-name width -->
+      <column type="gint"/>
+      <!-- column-name height -->
+      <column type="gint"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="photo_dpi_model">
+    <columns>
+      <!-- column-name dpi -->
+      <column type="gint"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="text_dpi_model">
+    <columns>
+      <!-- column-name dpi -->
+      <column type="gint"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <template class="PreferencesDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes" comments="Title of preferences dialog">Preferences</property>
+    <property name="resizable">False</property>
+    <property name="icon_name">scanner</property>
+    <property name="type_hint">normal</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_top">30</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="preferences_close_button">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkNotebook">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="show_border">False</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">30</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">30</property>
+                <child>
+                  <object class="GtkGrid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">15</property>
+                    <property name="column_spacing">10</property>
+                    <child>
+                      <object class="GtkLabel" id="source_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label beside scan source combo box">_Scanner</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">device_combo</property>
+                        <property name="xalign">1</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="device_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="model">device_model</property>
+                        <signal name="changed" handler="device_combo_changed_cb" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="page_side_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label beside scan side combo box">Scan Sides</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">scan_side_box</property>
+                        <property name="xalign">1</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="paper_size_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label beside page size combo box">Page Size</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">1</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="paper_size_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="model">paper_size_model</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="scan_side_box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="homogeneous">True</property>
+                        <child>
+                          <object class="GtkRadioButton" id="front_side_button">
+                            <property name="label" translatable="yes" comments="Preferences Dialog: Toggle button to select scanning on front side of a page">Front</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="back_side_button">
+                            <property name="label" translatable="yes" comments="Preferences Dialog: Toggle button to select scanning on the back side of a page">Back</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="draw_indicator">False</property>
+                            <property name="group">front_side_button</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="both_side_button">
+                            <property name="label" translatable="yes" comments="Preferences Dialog: Toggle button to select scanning on both sides of a page">Both</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="draw_indicator">False</property>
+                            <property name="group">front_side_button</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <style>
+                          <class name="linked"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">15</property>
+                    <property name="column_spacing">10</property>
+                    <child>
+                      <object class="GtkLabel" id="page_delay_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label beside page delay scale">Delay</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">1</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Preferences dialog: Label above settings for scanning multiple pages from a flatbed">Multiple pages from flatbed</property>
+                        <property name="xalign">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="homogeneous">True</property>
+                        <child>
+                          <object class="GtkRadioButton" id="page_delay_3s_button">
+                            <property name="label" translatable="yes" comments="Preferences Dialog: Toggle button to select scanning on front side of a page">3</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="page_delay_5s_button">
+                            <property name="label" translatable="yes" comments="Preferences Dialog: Toggle button to select scanning on front side of a page">5</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">False</property>
+                            <property name="group">page_delay_3s_button</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="page_delay_7s_button">
+                            <property name="label" translatable="yes" comments="Preferences Dialog: Toggle button to select scanning on front side of a page">7</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">False</property>
+                            <property name="group">page_delay_3s_button</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="page_delay_10s_button">
+                            <property name="label" translatable="yes" comments="Preferences Dialog: Toggle button to select scanning on front side of a page">10</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">False</property>
+                            <property name="group">page_delay_3s_button</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="page_delay_15s_button">
+                            <property name="label" translatable="yes" comments="Preferences Dialog: Toggle button to select scanning on front side of a page">15</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">False</property>
+                            <property name="group">page_delay_3s_button</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <style>
+                          <class name="linked"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label after page delay radio buttons">Seconds</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">1</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="tab_expand">True</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" comments="Preferences Dialog: Tab label for scanning settings">Scanning</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">30</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">30</property>
+                <child>
+                  <object class="GtkGrid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">14</property>
+                    <property name="column_spacing">10</property>
+                    <child>
+                      <object class="GtkLabel" id="text_dpi_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label beside scan source combo box">_Text Resolution</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">1</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="photo_dpi_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label beside scan source combo box">_Photo Resolution</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">1</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="text_dpi_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="model">text_dpi_model</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="photo_dpi_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="model">photo_dpi_model</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">15</property>
+                    <property name="column_spacing">10</property>
+                    <child>
+                      <object class="GtkLabel" id="brightness_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label beside brightness scale">Brightness</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">1</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="contrast_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Label beside contrast scale">Contrast</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">1</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScale" id="brightness_scale">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="adjustment">brightness_adjustment</property>
+                        <property name="draw_value">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScale" id="contrast_scale">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="adjustment">contrast_adjustment</property>
+                        <property name="draw_value">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_expand">True</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" comments="Preferences Dialog: Tab for quality settings">Quality</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="1">preferences_close_button</action-widget>
+    </action-widgets>
+  </template>
+  <object class="GtkSizeGroup" id="label_size_group">
+    <widgets>
+      <widget name="source_label"/>
+      <widget name="page_side_label"/>
+      <widget name="paper_size_label"/>
+      <widget name="page_delay_label"/>
+      <widget name="text_dpi_label"/>
+      <widget name="photo_dpi_label"/>
+      <widget name="brightness_label"/>
+      <widget name="contrast_label"/>
+    </widgets>
+  </object>
+</interface>
diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
new file mode 100644
index 0000000..bf213fb
--- /dev/null
+++ b/src/preferences-dialog.vala
@@ -0,0 +1,534 @@
+/*
+ * Copyright (C) 2009-2017 Canonical Ltd.
+ * Author: Robert Ancell <robert.ancell@canonical.com>,
+ *         Eduard Gotwig <g@ox.io>
+ *
+ * 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.
+ */
+
+[GtkTemplate (ui = "/org/gnome/SimpleScan/preferences-dialog.ui")]
+private class PreferencesDialog : Gtk.Dialog
+{
+    private Settings settings;
+
+    private bool setting_devices;
+    private bool user_selected_device;
+
+    [GtkChild]
+    private Gtk.ComboBox device_combo;
+    [GtkChild]
+    private Gtk.ComboBox text_dpi_combo;
+    [GtkChild]
+    private Gtk.ComboBox photo_dpi_combo;
+    [GtkChild]
+    private Gtk.ComboBox paper_size_combo;
+    [GtkChild]
+    private Gtk.Scale brightness_scale;
+    [GtkChild]
+    private Gtk.Scale contrast_scale;
+    [GtkChild]
+    private Gtk.ListStore device_model;
+    [GtkChild]
+    private Gtk.RadioButton page_delay_3s_button;
+    [GtkChild]
+    private Gtk.RadioButton page_delay_5s_button;
+    [GtkChild]
+    private Gtk.RadioButton page_delay_7s_button;
+    [GtkChild]
+    private Gtk.RadioButton page_delay_10s_button;
+    [GtkChild]
+    private Gtk.RadioButton page_delay_15s_button;
+    [GtkChild]
+    private Gtk.ListStore text_dpi_model;
+    [GtkChild]
+    private Gtk.ListStore photo_dpi_model;
+    [GtkChild]
+    private Gtk.RadioButton front_side_button;
+    [GtkChild]
+    private Gtk.RadioButton back_side_button;
+    [GtkChild]
+    private Gtk.RadioButton both_side_button;
+    [GtkChild]
+    private Gtk.ListStore paper_size_model;
+    [GtkChild]
+    private Gtk.Adjustment brightness_adjustment;
+    [GtkChild]
+    private Gtk.Adjustment contrast_adjustment;
+    [GtkChild]
+    private Gtk.Button preferences_close_button;
+
+    public PreferencesDialog (Settings settings, bool use_header_bar)
+    {
+        Object (use_header_bar: use_header_bar ? 1 : -1);
+
+        if (use_header_bar)
+            preferences_close_button.visible = false;
+
+        this.settings = settings;
+
+        Gtk.TreeIter iter;
+        paper_size_model.append (out iter);
+        paper_size_model.set (iter, 0, 0, 1, 0, 2,
+                              /* Combo box value for automatic paper size */
+                              _("Automatic"), -1);
+        paper_size_model.append (out iter);
+        paper_size_model.set (iter, 0, 1050, 1, 1480, 2, "A6", -1);
+        paper_size_model.append (out iter);
+        paper_size_model.set (iter, 0, 1480, 1, 2100, 2, "A5", -1);
+        paper_size_model.append (out iter);
+        paper_size_model.set (iter, 0, 2100, 1, 2970, 2, "A4", -1);
+        paper_size_model.append (out iter);
+        paper_size_model.set (iter, 0, 2159, 1, 2794, 2, "Letter", -1);
+        paper_size_model.append (out iter);
+        paper_size_model.set (iter, 0, 2159, 1, 3556, 2, "Legal", -1);
+        paper_size_model.append (out iter);
+        paper_size_model.set (iter, 0, 1016, 1, 1524, 2, "4×6", -1);
+
+        var renderer = new Gtk.CellRendererText ();
+        device_combo.pack_start (renderer, true);
+        device_combo.add_attribute (renderer, "text", 1);
+
+        var dpi = settings.get_int ("text-dpi");
+        if (dpi <= 0)
+            dpi = DEFAULT_TEXT_DPI;
+        set_dpi_combo (text_dpi_combo, DEFAULT_TEXT_DPI, dpi);
+        text_dpi_combo.changed.connect (() => { settings.set_int ("text-dpi", get_text_dpi ()); });
+        dpi = settings.get_int ("photo-dpi");
+        if (dpi <= 0)
+            dpi = DEFAULT_PHOTO_DPI;
+        set_dpi_combo (photo_dpi_combo, DEFAULT_PHOTO_DPI, dpi);
+        photo_dpi_combo.changed.connect (() => { settings.set_int ("photo-dpi", get_photo_dpi ()); });
+
+        set_page_side ((ScanType) settings.get_enum ("page-side"));
+        front_side_button.toggled.connect ((button) => { if (button.active) settings.set_enum ("page-side", ScanType.ADF_FRONT); });
+        back_side_button.toggled.connect ((button) => { if (button.active) settings.set_enum ("page-side", ScanType.ADF_BACK); });
+        both_side_button.toggled.connect ((button) => { if (button.active) settings.set_enum ("page-side", ScanType.ADF_BOTH); });
+
+        renderer = new Gtk.CellRendererText ();
+        paper_size_combo.pack_start (renderer, true);
+        paper_size_combo.add_attribute (renderer, "text", 2);
+
+        var lower = brightness_adjustment.lower;
+        var darker_label = "<small>%s</small>".printf (_("Darker"));
+        var upper = brightness_adjustment.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);
+        brightness_adjustment.value = settings.get_int ("brightness");
+        brightness_adjustment.value_changed.connect (() => { settings.set_int ("brightness", get_brightness ()); });
+
+        lower = contrast_adjustment.lower;
+        var less_label = "<small>%s</small>".printf (_("Less"));
+        upper = contrast_adjustment.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);
+        contrast_adjustment.value = settings.get_int ("contrast");
+        contrast_adjustment.value_changed.connect (() => { settings.set_int ("contrast", get_contrast ()); });
+
+        var paper_width = settings.get_int ("paper-width");
+        var paper_height = settings.get_int ("paper-height");
+        set_paper_size (paper_width, paper_height);
+        paper_size_combo.changed.connect (() =>
+        {
+            int w, h;
+            get_paper_size (out w, out h);
+            settings.set_int ("paper-width", w);
+            settings.set_int ("paper-height", h);
+        });
+
+        set_page_delay (settings.get_int ("page-delay"));
+        page_delay_3s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 3); });
+        page_delay_5s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 5); });
+        page_delay_7s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 7); });
+        page_delay_10s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 10); });
+        page_delay_15s_button.toggled.connect ((button) => { if (button.active) settings.set_int ("page-delay", 15); });
+    }
+
+    public void set_scan_devices (List<ScanDevice> devices)
+    {
+        setting_devices = true;
+
+        /* If the user hasn't chosen a scanner choose the best available one */
+        var have_selection = false;
+        if (user_selected_device)
+            have_selection = device_combo.active >= 0;
+
+        /* Add new devices */
+        int index = 0;
+        Gtk.TreeIter iter;
+        foreach (var device in devices)
+        {
+            int n_delete = -1;
+
+            /* Find if already exists */
+            if (device_model.iter_nth_child (out iter, null, index))
+            {
+                int i = 0;
+                do
+                {
+                    string name;
+                    bool matched;
+
+                    device_model.get (iter, 0, out name, -1);
+                    matched = name == device.name;
+
+                    if (matched)
+                    {
+                        n_delete = i;
+                        break;
+                    }
+                    i++;
+                } while (device_model.iter_next (ref iter));
+            }
+
+            /* If exists, remove elements up to this one */
+            if (n_delete >= 0)
+            {
+                int i;
+
+                /* Update label */
+                device_model.set (iter, 1, device.label, -1);
+
+                for (i = 0; i < n_delete; i++)
+                {
+                    device_model.iter_nth_child (out iter, null, index);
+#if VALA_0_36
+                    device_model.remove (ref iter);
+#else
+                    device_model.remove (iter);
+#endif
+                }
+            }
+            else
+            {
+                device_model.insert (out iter, index);
+                device_model.set (iter, 0, device.name, 1, device.label, -1);
+            }
+            index++;
+        }
+
+        /* Remove any remaining devices */
+        while (device_model.iter_nth_child (out iter, null, index))
+#if VALA_0_36
+            device_model.remove (ref iter);
+#else
+            device_model.remove (iter);
+#endif
+
+        /* Select the previously selected device or the first available device */
+        if (!have_selection)
+        {
+            var device = settings.get_string ("selected-device");
+            if (device != null && find_scan_device (device, out iter))
+                device_combo.set_active_iter (iter);
+            else
+                device_combo.set_active (0);
+        }
+
+        setting_devices = false;
+    }
+
+    public string? get_selected_device ()
+    {
+        Gtk.TreeIter iter;
+
+        if (device_combo.get_active_iter (out iter))
+        {
+            string device;
+            device_model.get (iter, 0, out device, -1);
+            return device;
+        }
+
+        return null;
+    }
+
+    public string? get_selected_device_label ()
+    {
+        Gtk.TreeIter iter;
+
+        if (device_combo.get_active_iter (out iter))
+        {
+            string label;
+            device_model.get (iter, 1, out label, -1);
+            return label;
+        }
+
+        return null;
+    }
+
+    public void set_selected_device (string device)
+    {
+        user_selected_device = true;
+
+        Gtk.TreeIter iter;
+        if (!find_scan_device (device, out iter))
+            return;
+
+        device_combo.set_active_iter (iter);
+    }
+
+    private bool find_scan_device (string device, out Gtk.TreeIter iter)
+    {
+        bool have_iter = false;
+
+        if (device_model.get_iter_first (out iter))
+        {
+            do
+            {
+                string d;
+                device_model.get (iter, 0, out d, -1);
+                if (d == device)
+                    have_iter = true;
+            } while (!have_iter && device_model.iter_next (ref iter));
+        }
+
+        return have_iter;
+    }
+
+    private void set_page_side (ScanType page_side)
+    {
+        switch (page_side)
+        {
+        case ScanType.ADF_FRONT:
+            front_side_button.active = true;
+            break;
+        case ScanType.ADF_BACK:
+            back_side_button.active = true;
+            break;
+        default:
+        case ScanType.ADF_BOTH:
+            both_side_button.active = true;
+            break;
+        }
+    }
+
+    public ScanType get_page_side ()
+    {
+        if (front_side_button.active)
+            return ScanType.ADF_FRONT;
+        else if (back_side_button.active)
+            return ScanType.ADF_BACK;
+        else
+            return ScanType.ADF_BOTH;
+    }
+
+    public void set_paper_size (int width, int height)
+    {
+        Gtk.TreeIter iter;
+        bool have_iter;
+
+        for (have_iter = paper_size_model.get_iter_first (out iter);
+             have_iter;
+             have_iter = paper_size_model.iter_next (ref iter))
+        {
+            int w, h;
+            paper_size_model.get (iter, 0, out w, 1, out h, -1);
+            if (w == width && h == height)
+               break;
+        }
+
+        if (!have_iter)
+            have_iter = paper_size_model.get_iter_first (out iter);
+        if (have_iter)
+            paper_size_combo.set_active_iter (iter);
+    }
+
+    public int get_text_dpi ()
+    {
+        Gtk.TreeIter iter;
+        int dpi = DEFAULT_TEXT_DPI;
+
+        if (text_dpi_combo.get_active_iter (out iter))
+            text_dpi_model.get (iter, 0, out dpi, -1);
+
+        return dpi;
+    }
+
+    public int get_photo_dpi ()
+    {
+        Gtk.TreeIter iter;
+        int dpi = DEFAULT_PHOTO_DPI;
+
+        if (photo_dpi_combo.get_active_iter (out iter))
+            photo_dpi_model.get (iter, 0, out dpi, -1);
+
+        return dpi;
+    }
+
+    public bool get_paper_size (out int width, out int height)
+    {
+        Gtk.TreeIter iter;
+
+        width = height = 0;
+        if (paper_size_combo.get_active_iter (out iter))
+        {
+            paper_size_model.get (iter, 0, ref width, 1, ref height, -1);
+            return true;
+        }
+
+        return false;
+    }
+
+    public int get_brightness ()
+    {
+        return (int) brightness_adjustment.value;
+    }
+
+    public void set_brightness (int brightness)
+    {
+        brightness_adjustment.value = brightness;
+    }
+
+    public int get_contrast ()
+    {
+        return (int) contrast_adjustment.value;
+    }
+
+    public void set_contrast (int contrast)
+    {
+        contrast_adjustment.value = contrast;
+    }
+
+    public int get_page_delay ()
+    {
+        if (page_delay_15s_button.active)
+            return 15;
+        else if (page_delay_10s_button.active)
+            return 10;
+        else if (page_delay_7s_button.active)
+            return 7;
+        else if (page_delay_5s_button.active)
+            return 5;
+        else
+            return 3;
+    }
+
+    public void set_page_delay (int page_delay)
+    {
+        if (page_delay >= 15)
+            page_delay_15s_button.active = true;
+        else if (page_delay >= 10)
+            page_delay_10s_button.active = true;
+        else if (page_delay >= 7)
+            page_delay_7s_button.active = true;
+        else if (page_delay >= 5)
+            page_delay_5s_button.active = true;
+        else
+            page_delay_3s_button.active = true;
+    }
+
+    private void set_dpi_combo (Gtk.ComboBox combo, int default_dpi, int current_dpi)
+    {
+        var renderer = new Gtk.CellRendererText ();
+        combo.pack_start (renderer, true);
+        combo.add_attribute (renderer, "text", 1);
+
+        var model = combo.model as Gtk.ListStore;
+        int[] scan_resolutions = {75, 150, 300, 600, 1200, 2400};
+        foreach (var dpi in scan_resolutions)
+        {
+            string label;
+            if (dpi == default_dpi)
+                /* Preferences dialog: Label for default resolution in resolution list */
+                label = _("%d dpi (default)").printf (dpi);
+            else if (dpi == 75)
+                /* Preferences dialog: Label for minimum resolution in resolution list */
+                label = _("%d dpi (draft)").printf (dpi);
+            else if (dpi == 1200)
+                /* Preferences dialog: Label for maximum resolution in resolution list */
+                label = _("%d dpi (high resolution)").printf (dpi);
+            else
+                /* Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch) */
+                label = _("%d dpi").printf (dpi);
+
+            Gtk.TreeIter iter;
+            model.append (out iter);
+            model.set (iter, 0, dpi, 1, label, -1);
+
+            if (dpi == current_dpi)
+                combo.set_active_iter (iter);
+        }
+    }
+
+    [GtkCallback]
+    private void device_combo_changed_cb (Gtk.Widget widget)
+    {
+        if (setting_devices)
+            return;
+        user_selected_device = true;
+        if (get_selected_device () != null)
+            settings.set_string ("selected-device", get_selected_device ());
+    }
+}
+
+private class PageIcon : Gtk.DrawingArea
+{
+    private string text;
+    private double r;
+    private double g;
+    private double b;
+    private const int MINIMUM_WIDTH = 20;
+
+    public PageIcon (string text, double r = 1.0, double g = 1.0, double b = 1.0)
+    {
+        this.text = text;
+        this.r = r;
+        this.g = g;
+        this.b = b;
+    }
+
+    public override void get_preferred_width (out int minimum_width, out int natural_width)
+    {
+        minimum_width = natural_width = MINIMUM_WIDTH;
+    }
+
+    public override void get_preferred_height (out int minimum_height, out int natural_height)
+    {
+        minimum_height = natural_height = (int) Math.round (MINIMUM_WIDTH * Math.SQRT2);
+    }
+
+    public override void get_preferred_height_for_width (int width, out int minimum_height, out int natural_height)
+    {
+        minimum_height = natural_height = (int) (width * Math.SQRT2);
+    }
+
+    public override void get_preferred_width_for_height (int height, out int minimum_width, out int natural_width)
+    {
+        minimum_width = natural_width = (int) (height / Math.SQRT2);
+    }
+
+    public override bool draw (Cairo.Context c)
+    {
+        var w = get_allocated_width ();
+        var h = get_allocated_height ();
+        if (w * Math.SQRT2 > h)
+            w = (int) Math.round (h / Math.SQRT2);
+        else
+            h = (int) Math.round (w * Math.SQRT2);
+
+        c.translate ((get_allocated_width () - w) / 2, (get_allocated_height () - h) / 2);
+
+        c.rectangle (0.5, 0.5, w - 1, h - 1);
+
+        c.set_source_rgb (r, g, b);
+        c.fill_preserve ();
+
+        c.set_line_width (1.0);
+        c.set_source_rgb (0.0, 0.0, 0.0);
+        c.stroke ();
+
+        Cairo.TextExtents extents;
+        c.text_extents (text, out extents);
+        c.translate ((w - extents.width) * 0.5 - 0.5, (h + extents.height) * 0.5 - 0.5);
+        c.show_text (text);
+
+        return true;
+    }
+}
diff --git a/src/resources.c b/src/resources.c
deleted file mode 100644
index e7147d9..0000000
--- a/src/resources.c
+++ /dev/null
@@ -1,6482 +0,0 @@
-#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[50559]; 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, 
-  0x7f, 0xc5, 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, 
-  0x87, 0xc4, 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, 0x20, 0x65, 0x6e, 0x63, 0x6f, 
-  0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, 
-  0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 
-  0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 
-  0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 
-  0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 
-  0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 
-  0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 
-  0x2e, 0x31, 0x30, 0x20, 0x2d, 0x2d, 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, 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, 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, 
-  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, 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, 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, 
-  0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 
-  0x74, 0x69, 0x63, 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, 
-  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, 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, 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, 
-  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, 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, 0x66, 0x69, 0x6c, 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, 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, 
-  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, 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, 
-  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, 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, 0x6f, 0x72, 0x69, 
-  0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 
-  0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 
-  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, 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, 
-  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, 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, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 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, 0x66, 0x69, 0x6c, 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, 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, 
-  0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 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, 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, 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, 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, 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, 0x68, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 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, 0xe2, 
-  0x97, 0x8f, 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, 
-  0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 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, 
-  0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 0x68, 
-  0x74, 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, 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, 0x68, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 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, 0xe2, 0x97, 0x8f, 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, 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, 0x77, 0x69, 0x64, 0x74, 
-  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, 0x68, 
-  0x65, 0x69, 0x67, 0x68, 0x74, 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, 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, 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, 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, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 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, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 
-  0x67, 0x68, 0x74, 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, 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, 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, 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, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 
-  0x74, 0x74, 0x61, 0x63, 0x68, 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, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 
-  0x69, 0x67, 0x68, 0x74, 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, 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, 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, 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, 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, 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, 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, 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, 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, 0x4c, 0x69, 0x73, 
-  0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x64, 0x65, 0x76, 0x69, 
-  0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 
-  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, 
-  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, 
-  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, 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, 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, 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, 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, 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, 0x6d, 0x6f, 0x64, 
-  0x65, 0x6c, 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, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 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, 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, 0x6d, 0x6f, 0x64, 0x65, 
-  0x6c, 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, 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, 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, 0x74, 
-  0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x55, 
-  0x73, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, 0x72, 
-  0x66, 0x61, 0x63, 0x65, 0x22, 0x20, 0x70, 0x61, 
-  0x72, 0x65, 0x6e, 0x74, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 
-  0x74, 0x69, 0x6f, 0x6e, 0x57, 0x69, 0x6e, 0x64, 
-  0x6f, 0x77, 0x22, 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, 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, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
-  0x2d, 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, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 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, 
-  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, 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, 0x6f, 
-  0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 
-  0x69, 0x63, 0x61, 0x6c, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 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, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 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, 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, 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, 
-  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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
-  0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 
-  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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 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, 0x72, 
-  0x65, 0x6f, 0x72, 0x64, 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, 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, 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, 0x65, 0x6f, 
-  0x72, 0x64, 0x65, 0x72, 0x20, 0x70, 0x61, 0x67, 
-  0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, 0x6f, 0x72, 
-  0x64, 0x65, 0x72, 0x20, 0x50, 0x61, 0x67, 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, 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, 0x72, 0x65, 0x6f, 0x72, 0x64, 
-  0x65, 0x72, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 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, 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, 
-  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, 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, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 
-  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
-  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, 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, 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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 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, 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, 
-  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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 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, 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, 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, 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, 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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 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, 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, 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, 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, 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, 
-  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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 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, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 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, 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, 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, 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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 
-  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
-  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, 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, 
-  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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 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, 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, 
-  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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
-  0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 
-  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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
-  0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 0x66, 0x6f, 0x75, 
-  0x72, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x69, 0x78, 
-  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, 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, 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, 0xc3, 
-  0x97, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 
-  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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 
-  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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
-  0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 
-  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
-  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, 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, 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, 0x20, 0x73, 0x77, 0x61, 
-  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
-  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, 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, 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, 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, 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, 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, 
-  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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 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, 0x66, 0x69, 0x6c, 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, 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, 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, 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, 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, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
-  0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 
-  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, 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, 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, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 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, 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, 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, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 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, 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, 
-  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, 
-  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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 
-  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
-  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, 0x66, 0x69, 0x6c, 
-  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, 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, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 
-  0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 
-  0x6c, 0x65, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 
-  0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 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, 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, 0x76, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 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, 0x68, 
-  0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 
-  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 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, 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, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 
-  0x65, 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, 
-  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 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, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 
-  0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, 
-  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, 0x76, 0x61, 0x6c, 
-  0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 
-  0x74, 0x65, 0x72, 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, 0x6c, 0x69, 0x6e, 0x6b, 0x65, 0x64, 
-  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, 0x42, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x73, 0x74, 0x6f, 0x70, 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, 0x76, 0x69, 0x73, 
-  0x69, 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, 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, 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, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x79, 
-  0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x73, 0x74, 0x79, 0x6c, 0x65, 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, 
-  0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 
-  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, 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, 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, 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, 0x20, 
-  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
-  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
-  0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 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, 0x42, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x6f, 0x70, 0x65, 0x6e, 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, 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, 0x70, 
-  0x6f, 0x70, 0x75, 0x70, 0x22, 0x3e, 0x73, 0x63, 
-  0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x5f, 0x68, 0x62, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 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, 
-  0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x73, 0x74, 0x79, 0x6c, 0x65, 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, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 
-  0x70, 0x65, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 
-  0x74, 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, 0x42, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 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, 
-  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, 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, 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, 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, 
-  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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 
-  0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 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, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 
-  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, 0x73, 0x69, 0x7a, 
-  0x65, 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, 0x69, 
-  0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 
-  0x22, 0x3e, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
-  0x6e, 0x74, 0x2d, 0x73, 0x61, 0x76, 0x65, 0x2d, 
-  0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 
-  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, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 
-  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-  0x20, 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, 0x42, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x6e, 0x65, 0x77, 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, 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, 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, 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, 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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 
-  0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 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, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x6e, 0x65, 0x77, 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, 0x73, 0x69, 0x7a, 0x65, 
-  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, 0x69, 0x63, 
-  0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 
-  0x3e, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
-  0x74, 0x2d, 0x6e, 0x65, 0x77, 0x2d, 0x73, 0x79, 
-  0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 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, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x20, 
-  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 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, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 
-  0x65, 0x5f, 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, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 
-  0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x68, 0x6f, 0x72, 0x69, 
-  0x7a, 0x6f, 0x6e, 0x74, 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, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
-  0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 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, 0x6c, 0x69, 
-  0x6e, 0x6b, 0x65, 0x64, 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, 
-  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, 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, 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, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 
-  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 
-  0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
-  0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 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, 0x49, 
-  0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x72, 0x69, 
-  0x67, 0x68, 0x74, 0x2d, 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, 0x69, 0x63, 0x6f, 0x6e, 
-  0x5f, 0x73, 0x69, 0x7a, 0x65, 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, 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, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 
-  0x69, 0x63, 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, 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, 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, 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, 0x42, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6c, 
-  0x65, 0x66, 0x74, 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, 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, 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, 
-  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, 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, 0x20, 0x73, 0x77, 0x61, 
-  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 
-  0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
-  0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 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, 0x49, 
-  0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x6c, 0x65, 
-  0x66, 0x74, 0x2d, 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, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
-  0x73, 0x69, 0x7a, 0x65, 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, 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, 0x2d, 
-  0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 
-  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, 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, 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, 
-  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, 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, 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, 0x42, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x63, 0x72, 0x6f, 0x70, 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, 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, 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, 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, 0x74, 
-  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x67, 
-  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 
-  0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 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, 0x49, 0x6d, 0x61, 0x67, 0x65, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x63, 0x72, 0x6f, 0x70, 
-  0x2d, 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, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 
-  0x7a, 0x65, 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, 
-  0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 
-  0x65, 0x22, 0x3e, 0x65, 0x64, 0x69, 0x74, 0x2d, 
-  0x63, 0x75, 0x74, 0x2d, 0x73, 0x79, 0x6d, 0x62, 
-  0x6f, 0x6c, 0x69, 0x63, 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, 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, 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, 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, 0x0a, 
-  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x2f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 
-  0x74, 0x65, 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, 0x6d, 0x6f, 0x64, 
-  0x65, 0x6c, 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, 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, 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, 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, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
-  0x2d, 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, 0x20, 0x73, 0x77, 0x61, 
-  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
-  0x22, 0x2f, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 
-  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, 0x6f, 0x72, 0x69, 0x65, 0x6e, 
-  0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 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, 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, 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, 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, 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, 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, 0x66, 0x69, 0x6c, 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, 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, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 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, 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, 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, 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, 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, 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, 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, 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, 0x6c, 0x65, 0x66, 
-  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  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, 0x74, 0x6f, 
-  0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  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, 0x77, 0x69, 
-  0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 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, 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, 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, 0x68, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 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, 0x6d, 0x6f, 0x64, 
-  0x65, 0x6c, 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, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 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, 0x74, 
-  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 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, 0x77, 
-  0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
-  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, 
-  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, 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, 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, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 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, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 
-  0x67, 0x68, 0x74, 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, 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, 
-  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, 
-  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, 0x6c, 
-  0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 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, 
-  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, 
-  0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 0x68, 
-  0x74, 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, 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, 
-  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, 0x68, 0x65, 0x78, 0x70, 0x61, 
-  0x6e, 0x64, 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, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 
-  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, 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, 0x77, 0x69, 
-  0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 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, 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, 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, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 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, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 
-  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, 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, 0x77, 0x69, 
-  0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 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, 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, 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, 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, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 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, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 
-  0x67, 0x68, 0x74, 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, 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, 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, 0x68, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 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, 0x6d, 
-  0x6f, 0x64, 0x65, 0x6c, 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, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 
-  0x67, 0x68, 0x74, 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, 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, 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, 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, 0x6c, 0x65, 
-  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 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, 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, 0x77, 
-  0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
-  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, 
-  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, 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, 0x68, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 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, 0x6d, 0x6f, 
-  0x64, 0x65, 0x6c, 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, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 
-  0x68, 0x74, 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, 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, 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, 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, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 
-  0x68, 0x74, 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, 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, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 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, 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, 0x77, 0x69, 0x64, 
-  0x74, 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, 
-  0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 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, 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, 
-  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 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, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 
-  0x68, 0x74, 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, 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, 
-  0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 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, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 
-  0x68, 0x74, 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, 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, 
-  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 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, 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, 0x77, 0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 
-  0x68, 0x74, 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, 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, 0x68, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 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, 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, 0x77, 
-  0x69, 0x64, 0x74, 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, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
-  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, 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, 
-  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, 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, 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, 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, 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, 
-  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, 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, 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, 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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 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, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
-  0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 
-  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, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 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, 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, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 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, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x68, 
-  0x62, 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, 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, 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, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x68, 0x62, 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, 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, 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, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 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, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x5f, 0x68, 0x62, 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, 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, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 
-  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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, 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, 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, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x5f, 0x68, 0x62, 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, 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, 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, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 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, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x5f, 0x68, 0x62, 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, 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, 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, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x5f, 0x68, 0x62, 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, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
-  0x64, 0x3d, 0x22, 0x6e, 0x6f, 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, 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) {
-   ...
-  }
-
-*/
-
-#ifndef __GTK_DOC_IGNORE__
-
-#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
-
-/* We do some weird things to avoid the constructors being optimized
- * away on VS2015 if WholeProgramOptimization is enabled. First we
- * make a reference to the array from the wrapper to make sure its
- * references. Then we use a pragma to make sure the wrapper function
- * symbol is always included at the link stage. Also, the symbols
- * need to be extern (but not dllexport), even though they are not
- * really used from another object file.
- */
-
-/* We need to account for differences between the mangling of symbols
- * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed
- * with an underscore but symbols on x64 are not.
- */
-#ifdef _WIN64
-#define G_MSVC_SYMBOL_PREFIX ""
-#else
-#define G_MSVC_SYMBOL_PREFIX "_"
-#endif
-
-#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX)
-#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX)
-
-#define G_MSVC_CTOR(_func,_sym_prefix) \
-  static void _func(void); \
-  extern int (* _array ## _func)(void);              \
-  int _func ## _wrapper(void) { _func(); g_slist_find (NULL,  _array ## _func); return 0; } \
-  __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \
-  __pragma(section(".CRT$XCU",read)) \
-  __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper;
-
-#define G_MSVC_DTOR(_func,_sym_prefix) \
-  static void _func(void); \
-  extern int (* _array ## _func)(void);              \
-  int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL,  _array ## _func); return 0; } \
-   __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \
-  __pragma(section(".CRT$XCU",read)) \
-  __declspec(allocate(".CRT$XCU")) 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
-
-#endif /* __GTK_DOC_IGNORE__ */
-
-#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/sane.vapi b/src/sane-backends.vapi
index f636dac..f636dac 100644
--- a/src/sane.vapi
+++ b/src/sane-backends.vapi
diff --git a/src/scanner.c b/src/scanner.c
deleted file mode 100644
index 3500c4b..0000000
--- a/src/scanner.c
+++ /dev/null
@@ -1,13397 +0,0 @@
-/* scanner.c generated by valac 0.34.6, the Vala compiler
- * generated from scanner.vala, do not modify */
-
-/*
- * Copyright (C) 2009-2015 Canonical Ltd.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 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.
- */
-/* TODO: Could indicate the start of the next page immediately after the last page is received (i.e. before the sane_cancel()) */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <float.h>
-#include <math.h>
-#include "sane/sane.h"
-#include <glib/gi18n-lib.h>
-#include "sane/saneopts.h"
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_SCAN_DEVICE (scan_device_get_type ())
-#define SCAN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_DEVICE, ScanDevice))
-#define SCAN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_DEVICE, ScanDeviceClass))
-#define IS_SCAN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_DEVICE))
-#define IS_SCAN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_DEVICE))
-#define SCAN_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_DEVICE, ScanDeviceClass))
-
-typedef struct _ScanDevice ScanDevice;
-typedef struct _ScanDeviceClass ScanDeviceClass;
-typedef struct _ScanDevicePrivate ScanDevicePrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-typedef struct _ParamSpecScanDevice ParamSpecScanDevice;
-
-#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;
-typedef struct _ParamSpecScanPageInfo ParamSpecScanPageInfo;
-
-#define TYPE_SCAN_LINE (scan_line_get_type ())
-#define SCAN_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_LINE, ScanLine))
-#define SCAN_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_LINE, ScanLineClass))
-#define IS_SCAN_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_LINE))
-#define IS_SCAN_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_LINE))
-#define SCAN_LINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_LINE, ScanLineClass))
-
-typedef struct _ScanLine ScanLine;
-typedef struct _ScanLineClass ScanLineClass;
-typedef struct _ScanLinePrivate ScanLinePrivate;
-typedef struct _ParamSpecScanLine ParamSpecScanLine;
-
-#define TYPE_SCAN_MODE (scan_mode_get_type ())
-
-#define TYPE_SCAN_TYPE (scan_type_get_type ())
-
-#define TYPE_SCAN_OPTIONS (scan_options_get_type ())
-#define SCAN_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_OPTIONS, ScanOptions))
-#define SCAN_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_OPTIONS, ScanOptionsClass))
-#define IS_SCAN_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_OPTIONS))
-#define IS_SCAN_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_OPTIONS))
-#define SCAN_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_OPTIONS, ScanOptionsClass))
-
-typedef struct _ScanOptions ScanOptions;
-typedef struct _ScanOptionsClass ScanOptionsClass;
-typedef struct _ScanOptionsPrivate ScanOptionsPrivate;
-typedef struct _ParamSpecScanOptions ParamSpecScanOptions;
-
-#define TYPE_SCAN_JOB (scan_job_get_type ())
-#define SCAN_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_JOB, ScanJob))
-#define SCAN_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_JOB, ScanJobClass))
-#define IS_SCAN_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_JOB))
-#define IS_SCAN_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_JOB))
-#define SCAN_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_JOB, ScanJobClass))
-
-typedef struct _ScanJob ScanJob;
-typedef struct _ScanJobClass ScanJobClass;
-typedef struct _ScanJobPrivate ScanJobPrivate;
-typedef struct _ParamSpecScanJob ParamSpecScanJob;
-
-#define TYPE_REQUEST (request_get_type ())
-#define REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_REQUEST, Request))
-#define REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_REQUEST, RequestClass))
-#define IS_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_REQUEST))
-#define IS_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_REQUEST))
-#define REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_REQUEST, RequestClass))
-
-typedef struct _Request Request;
-typedef struct _RequestClass RequestClass;
-typedef struct _RequestPrivate RequestPrivate;
-typedef struct _ParamSpecRequest ParamSpecRequest;
-
-#define TYPE_REQUEST_REDETECT (request_redetect_get_type ())
-#define REQUEST_REDETECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_REQUEST_REDETECT, RequestRedetect))
-#define REQUEST_REDETECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_REQUEST_REDETECT, RequestRedetectClass))
-#define IS_REQUEST_REDETECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_REQUEST_REDETECT))
-#define IS_REQUEST_REDETECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_REQUEST_REDETECT))
-#define REQUEST_REDETECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_REQUEST_REDETECT, RequestRedetectClass))
-
-typedef struct _RequestRedetect RequestRedetect;
-typedef struct _RequestRedetectClass RequestRedetectClass;
-typedef struct _RequestRedetectPrivate RequestRedetectPrivate;
-
-#define TYPE_REQUEST_CANCEL (request_cancel_get_type ())
-#define REQUEST_CANCEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_REQUEST_CANCEL, RequestCancel))
-#define REQUEST_CANCEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_REQUEST_CANCEL, RequestCancelClass))
-#define IS_REQUEST_CANCEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_REQUEST_CANCEL))
-#define IS_REQUEST_CANCEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_REQUEST_CANCEL))
-#define REQUEST_CANCEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_REQUEST_CANCEL, RequestCancelClass))
-
-typedef struct _RequestCancel RequestCancel;
-typedef struct _RequestCancelClass RequestCancelClass;
-typedef struct _RequestCancelPrivate RequestCancelPrivate;
-
-#define TYPE_REQUEST_START_SCAN (request_start_scan_get_type ())
-#define REQUEST_START_SCAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_REQUEST_START_SCAN, RequestStartScan))
-#define REQUEST_START_SCAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_REQUEST_START_SCAN, RequestStartScanClass))
-#define IS_REQUEST_START_SCAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_REQUEST_START_SCAN))
-#define IS_REQUEST_START_SCAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_REQUEST_START_SCAN))
-#define REQUEST_START_SCAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_REQUEST_START_SCAN, RequestStartScanClass))
-
-typedef struct _RequestStartScan RequestStartScan;
-typedef struct _RequestStartScanClass RequestStartScanClass;
-typedef struct _RequestStartScanPrivate RequestStartScanPrivate;
-#define _scan_job_unref0(var) ((var == NULL) ? NULL : (var = (scan_job_unref (var), NULL)))
-
-#define TYPE_REQUEST_QUIT (request_quit_get_type ())
-#define REQUEST_QUIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_REQUEST_QUIT, RequestQuit))
-#define REQUEST_QUIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_REQUEST_QUIT, RequestQuitClass))
-#define IS_REQUEST_QUIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_REQUEST_QUIT))
-#define IS_REQUEST_QUIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_REQUEST_QUIT))
-#define REQUEST_QUIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_REQUEST_QUIT, RequestQuitClass))
-
-typedef struct _RequestQuit RequestQuit;
-typedef struct _RequestQuitClass RequestQuitClass;
-typedef struct _RequestQuitPrivate RequestQuitPrivate;
-
-#define TYPE_CREDENTIALS (credentials_get_type ())
-#define CREDENTIALS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CREDENTIALS, Credentials))
-#define CREDENTIALS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CREDENTIALS, CredentialsClass))
-#define IS_CREDENTIALS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CREDENTIALS))
-#define IS_CREDENTIALS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CREDENTIALS))
-#define CREDENTIALS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CREDENTIALS, CredentialsClass))
-
-typedef struct _Credentials Credentials;
-typedef struct _CredentialsClass CredentialsClass;
-typedef struct _CredentialsPrivate CredentialsPrivate;
-typedef struct _ParamSpecCredentials ParamSpecCredentials;
-
-#define TYPE_SCAN_STATE (scan_state_get_type ())
-
-#define TYPE_NOTIFY (notify_get_type ())
-#define NOTIFY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY, Notify))
-#define NOTIFY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY, NotifyClass))
-#define IS_NOTIFY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY))
-#define IS_NOTIFY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY))
-#define NOTIFY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY, NotifyClass))
-
-typedef struct _Notify Notify;
-typedef struct _NotifyClass NotifyClass;
-typedef struct _NotifyPrivate NotifyPrivate;
-
-#define TYPE_SCANNER (scanner_get_type ())
-#define SCANNER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCANNER, Scanner))
-#define SCANNER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCANNER, ScannerClass))
-#define IS_SCANNER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCANNER))
-#define IS_SCANNER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCANNER))
-#define SCANNER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCANNER, ScannerClass))
-
-typedef struct _Scanner Scanner;
-typedef struct _ScannerClass ScannerClass;
-typedef struct _ParamSpecNotify ParamSpecNotify;
-
-#define TYPE_NOTIFY_SCANNING_CHANGED (notify_scanning_changed_get_type ())
-#define NOTIFY_SCANNING_CHANGED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY_SCANNING_CHANGED, NotifyScanningChanged))
-#define NOTIFY_SCANNING_CHANGED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY_SCANNING_CHANGED, NotifyScanningChangedClass))
-#define IS_NOTIFY_SCANNING_CHANGED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY_SCANNING_CHANGED))
-#define IS_NOTIFY_SCANNING_CHANGED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY_SCANNING_CHANGED))
-#define NOTIFY_SCANNING_CHANGED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY_SCANNING_CHANGED, NotifyScanningChangedClass))
-
-typedef struct _NotifyScanningChanged NotifyScanningChanged;
-typedef struct _NotifyScanningChangedClass NotifyScanningChangedClass;
-typedef struct _NotifyScanningChangedPrivate NotifyScanningChangedPrivate;
-
-#define TYPE_NOTIFY_UPDATE_DEVICES (notify_update_devices_get_type ())
-#define NOTIFY_UPDATE_DEVICES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY_UPDATE_DEVICES, NotifyUpdateDevices))
-#define NOTIFY_UPDATE_DEVICES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY_UPDATE_DEVICES, NotifyUpdateDevicesClass))
-#define IS_NOTIFY_UPDATE_DEVICES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY_UPDATE_DEVICES))
-#define IS_NOTIFY_UPDATE_DEVICES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY_UPDATE_DEVICES))
-#define NOTIFY_UPDATE_DEVICES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY_UPDATE_DEVICES, NotifyUpdateDevicesClass))
-
-typedef struct _NotifyUpdateDevices NotifyUpdateDevices;
-typedef struct _NotifyUpdateDevicesClass NotifyUpdateDevicesClass;
-typedef struct _NotifyUpdateDevicesPrivate NotifyUpdateDevicesPrivate;
-#define __g_list_free__scan_device_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__scan_device_unref0_ (var), NULL)))
-
-#define TYPE_NOTIFY_REQUEST_AUTHORIZATION (notify_request_authorization_get_type ())
-#define NOTIFY_REQUEST_AUTHORIZATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY_REQUEST_AUTHORIZATION, NotifyRequestAuthorization))
-#define NOTIFY_REQUEST_AUTHORIZATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY_REQUEST_AUTHORIZATION, NotifyRequestAuthorizationClass))
-#define IS_NOTIFY_REQUEST_AUTHORIZATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY_REQUEST_AUTHORIZATION))
-#define IS_NOTIFY_REQUEST_AUTHORIZATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY_REQUEST_AUTHORIZATION))
-#define NOTIFY_REQUEST_AUTHORIZATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY_REQUEST_AUTHORIZATION, NotifyRequestAuthorizationClass))
-
-typedef struct _NotifyRequestAuthorization NotifyRequestAuthorization;
-typedef struct _NotifyRequestAuthorizationClass NotifyRequestAuthorizationClass;
-typedef struct _NotifyRequestAuthorizationPrivate NotifyRequestAuthorizationPrivate;
-
-#define TYPE_NOTIFY_SCAN_FAILED (notify_scan_failed_get_type ())
-#define NOTIFY_SCAN_FAILED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY_SCAN_FAILED, NotifyScanFailed))
-#define NOTIFY_SCAN_FAILED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY_SCAN_FAILED, NotifyScanFailedClass))
-#define IS_NOTIFY_SCAN_FAILED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY_SCAN_FAILED))
-#define IS_NOTIFY_SCAN_FAILED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY_SCAN_FAILED))
-#define NOTIFY_SCAN_FAILED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY_SCAN_FAILED, NotifyScanFailedClass))
-
-typedef struct _NotifyScanFailed NotifyScanFailed;
-typedef struct _NotifyScanFailedClass NotifyScanFailedClass;
-typedef struct _NotifyScanFailedPrivate NotifyScanFailedPrivate;
-
-#define TYPE_NOTIFY_DOCUMENT_DONE (notify_document_done_get_type ())
-#define NOTIFY_DOCUMENT_DONE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY_DOCUMENT_DONE, NotifyDocumentDone))
-#define NOTIFY_DOCUMENT_DONE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY_DOCUMENT_DONE, NotifyDocumentDoneClass))
-#define IS_NOTIFY_DOCUMENT_DONE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY_DOCUMENT_DONE))
-#define IS_NOTIFY_DOCUMENT_DONE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY_DOCUMENT_DONE))
-#define NOTIFY_DOCUMENT_DONE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY_DOCUMENT_DONE, NotifyDocumentDoneClass))
-
-typedef struct _NotifyDocumentDone NotifyDocumentDone;
-typedef struct _NotifyDocumentDoneClass NotifyDocumentDoneClass;
-typedef struct _NotifyDocumentDonePrivate NotifyDocumentDonePrivate;
-
-#define TYPE_NOTIFY_EXPECT_PAGE (notify_expect_page_get_type ())
-#define NOTIFY_EXPECT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY_EXPECT_PAGE, NotifyExpectPage))
-#define NOTIFY_EXPECT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY_EXPECT_PAGE, NotifyExpectPageClass))
-#define IS_NOTIFY_EXPECT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY_EXPECT_PAGE))
-#define IS_NOTIFY_EXPECT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY_EXPECT_PAGE))
-#define NOTIFY_EXPECT_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY_EXPECT_PAGE, NotifyExpectPageClass))
-
-typedef struct _NotifyExpectPage NotifyExpectPage;
-typedef struct _NotifyExpectPageClass NotifyExpectPageClass;
-typedef struct _NotifyExpectPagePrivate NotifyExpectPagePrivate;
-
-#define TYPE_NOTIFY_GOT_PAGE_INFO (notify_got_page_info_get_type ())
-#define NOTIFY_GOT_PAGE_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY_GOT_PAGE_INFO, NotifyGotPageInfo))
-#define NOTIFY_GOT_PAGE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY_GOT_PAGE_INFO, NotifyGotPageInfoClass))
-#define IS_NOTIFY_GOT_PAGE_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY_GOT_PAGE_INFO))
-#define IS_NOTIFY_GOT_PAGE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY_GOT_PAGE_INFO))
-#define NOTIFY_GOT_PAGE_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY_GOT_PAGE_INFO, NotifyGotPageInfoClass))
-
-typedef struct _NotifyGotPageInfo NotifyGotPageInfo;
-typedef struct _NotifyGotPageInfoClass NotifyGotPageInfoClass;
-typedef struct _NotifyGotPageInfoPrivate NotifyGotPageInfoPrivate;
-#define _scan_page_info_unref0(var) ((var == NULL) ? NULL : (var = (scan_page_info_unref (var), NULL)))
-typedef struct _ScannerPrivate ScannerPrivate;
-
-#define TYPE_NOTIFY_PAGE_DONE (notify_page_done_get_type ())
-#define NOTIFY_PAGE_DONE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY_PAGE_DONE, NotifyPageDone))
-#define NOTIFY_PAGE_DONE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY_PAGE_DONE, NotifyPageDoneClass))
-#define IS_NOTIFY_PAGE_DONE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY_PAGE_DONE))
-#define IS_NOTIFY_PAGE_DONE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY_PAGE_DONE))
-#define NOTIFY_PAGE_DONE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY_PAGE_DONE, NotifyPageDoneClass))
-
-typedef struct _NotifyPageDone NotifyPageDone;
-typedef struct _NotifyPageDoneClass NotifyPageDoneClass;
-typedef struct _NotifyPageDonePrivate NotifyPageDonePrivate;
-
-#define TYPE_NOTIFY_GOT_LINE (notify_got_line_get_type ())
-#define NOTIFY_GOT_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NOTIFY_GOT_LINE, NotifyGotLine))
-#define NOTIFY_GOT_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NOTIFY_GOT_LINE, NotifyGotLineClass))
-#define IS_NOTIFY_GOT_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NOTIFY_GOT_LINE))
-#define IS_NOTIFY_GOT_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NOTIFY_GOT_LINE))
-#define NOTIFY_GOT_LINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NOTIFY_GOT_LINE, NotifyGotLineClass))
-
-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)))
-#define _scanner_unref0(var) ((var == NULL) ? NULL : (var = (scanner_unref (var), NULL)))
-#define _notify_unref0(var) ((var == NULL) ? NULL : (var = (notify_unref (var), NULL)))
-#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _scan_device_unref0(var) ((var == NULL) ? NULL : (var = (scan_device_unref (var), NULL)))
-#define _credentials_unref0(var) ((var == NULL) ? NULL : (var = (credentials_unref (var), NULL)))
-#define _request_unref0(var) ((var == NULL) ? NULL : (var = (request_unref (var), NULL)))
-typedef struct _ParamSpecScanner ParamSpecScanner;
-
-struct _ScanDevice {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanDevicePrivate * priv;
-	gchar* name;
-	gchar* label;
-};
-
-struct _ScanDeviceClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanDevice *self);
-};
-
-struct _ParamSpecScanDevice {
-	GParamSpec parent_instance;
-};
-
-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 _ParamSpecScanPageInfo {
-	GParamSpec parent_instance;
-};
-
-struct _ScanLine {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanLinePrivate * priv;
-	gint number;
-	gint n_lines;
-	gint width;
-	gint depth;
-	gint channel;
-	guchar* data;
-	gint data_length1;
-	gint data_length;
-};
-
-struct _ScanLineClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanLine *self);
-};
-
-struct _ParamSpecScanLine {
-	GParamSpec parent_instance;
-};
-
-typedef enum  {
-	SCAN_MODE_DEFAULT,
-	SCAN_MODE_COLOR,
-	SCAN_MODE_GRAY,
-	SCAN_MODE_LINEART
-} ScanMode;
-
-typedef enum  {
-	SCAN_TYPE_SINGLE,
-	SCAN_TYPE_ADF_FRONT,
-	SCAN_TYPE_ADF_BACK,
-	SCAN_TYPE_ADF_BOTH
-} ScanType;
-
-struct _ScanOptions {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanOptionsPrivate * priv;
-	gint dpi;
-	ScanMode scan_mode;
-	gint depth;
-	ScanType type;
-	gint paper_width;
-	gint paper_height;
-	gint brightness;
-	gint contrast;
-};
-
-struct _ScanOptionsClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanOptions *self);
-};
-
-struct _ParamSpecScanOptions {
-	GParamSpec parent_instance;
-};
-
-struct _ScanJob {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanJobPrivate * priv;
-	gint id;
-	gchar* device;
-	gdouble dpi;
-	ScanMode scan_mode;
-	gint depth;
-	ScanType type;
-	gint page_width;
-	gint page_height;
-	gint brightness;
-	gint contrast;
-};
-
-struct _ScanJobClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanJob *self);
-};
-
-struct _ParamSpecScanJob {
-	GParamSpec parent_instance;
-};
-
-struct _Request {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	RequestPrivate * priv;
-};
-
-struct _RequestClass {
-	GTypeClass parent_class;
-	void (*finalize) (Request *self);
-};
-
-struct _ParamSpecRequest {
-	GParamSpec parent_instance;
-};
-
-struct _RequestRedetect {
-	Request parent_instance;
-	RequestRedetectPrivate * priv;
-};
-
-struct _RequestRedetectClass {
-	RequestClass parent_class;
-};
-
-struct _RequestCancel {
-	Request parent_instance;
-	RequestCancelPrivate * priv;
-};
-
-struct _RequestCancelClass {
-	RequestClass parent_class;
-};
-
-struct _RequestStartScan {
-	Request parent_instance;
-	RequestStartScanPrivate * priv;
-	ScanJob* job;
-};
-
-struct _RequestStartScanClass {
-	RequestClass parent_class;
-};
-
-struct _RequestQuit {
-	Request parent_instance;
-	RequestQuitPrivate * priv;
-};
-
-struct _RequestQuitClass {
-	RequestClass parent_class;
-};
-
-struct _Credentials {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	CredentialsPrivate * priv;
-	gchar* username;
-	gchar* password;
-};
-
-struct _CredentialsClass {
-	GTypeClass parent_class;
-	void (*finalize) (Credentials *self);
-};
-
-struct _ParamSpecCredentials {
-	GParamSpec parent_instance;
-};
-
-typedef enum  {
-	SCAN_STATE_IDLE = 0,
-	SCAN_STATE_REDETECT,
-	SCAN_STATE_OPEN,
-	SCAN_STATE_GET_OPTION,
-	SCAN_STATE_START,
-	SCAN_STATE_GET_PARAMETERS,
-	SCAN_STATE_READ
-} ScanState;
-
-struct _Notify {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	NotifyPrivate * priv;
-};
-
-struct _NotifyClass {
-	GTypeClass parent_class;
-	void (*finalize) (Notify *self);
-	void (*run) (Notify* self, Scanner* scanner);
-};
-
-struct _ParamSpecNotify {
-	GParamSpec parent_instance;
-};
-
-struct _NotifyScanningChanged {
-	Notify parent_instance;
-	NotifyScanningChangedPrivate * priv;
-};
-
-struct _NotifyScanningChangedClass {
-	NotifyClass parent_class;
-};
-
-struct _NotifyUpdateDevices {
-	Notify parent_instance;
-	NotifyUpdateDevicesPrivate * priv;
-};
-
-struct _NotifyUpdateDevicesClass {
-	NotifyClass parent_class;
-};
-
-struct _NotifyUpdateDevicesPrivate {
-	GList* devices;
-};
-
-struct _NotifyRequestAuthorization {
-	Notify parent_instance;
-	NotifyRequestAuthorizationPrivate * priv;
-};
-
-struct _NotifyRequestAuthorizationClass {
-	NotifyClass parent_class;
-};
-
-struct _NotifyRequestAuthorizationPrivate {
-	gchar* resource;
-};
-
-struct _NotifyScanFailed {
-	Notify parent_instance;
-	NotifyScanFailedPrivate * priv;
-};
-
-struct _NotifyScanFailedClass {
-	NotifyClass parent_class;
-};
-
-struct _NotifyScanFailedPrivate {
-	gint error_code;
-	gchar* error_string;
-};
-
-struct _NotifyDocumentDone {
-	Notify parent_instance;
-	NotifyDocumentDonePrivate * priv;
-};
-
-struct _NotifyDocumentDoneClass {
-	NotifyClass parent_class;
-};
-
-struct _NotifyExpectPage {
-	Notify parent_instance;
-	NotifyExpectPagePrivate * priv;
-};
-
-struct _NotifyExpectPageClass {
-	NotifyClass parent_class;
-};
-
-struct _NotifyGotPageInfo {
-	Notify parent_instance;
-	NotifyGotPageInfoPrivate * priv;
-};
-
-struct _NotifyGotPageInfoClass {
-	NotifyClass parent_class;
-};
-
-struct _NotifyGotPageInfoPrivate {
-	gint job_id;
-	ScanPageInfo* info;
-};
-
-struct _Scanner {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScannerPrivate * priv;
-	gint first_job_id;
-	gint job_id;
-};
-
-struct _ScannerClass {
-	GTypeClass parent_class;
-	void (*finalize) (Scanner *self);
-};
-
-struct _NotifyPageDone {
-	Notify parent_instance;
-	NotifyPageDonePrivate * priv;
-};
-
-struct _NotifyPageDoneClass {
-	NotifyClass parent_class;
-};
-
-struct _NotifyPageDonePrivate {
-	gint job_id;
-};
-
-struct _NotifyGotLine {
-	Notify parent_instance;
-	NotifyGotLinePrivate * priv;
-};
-
-struct _NotifyGotLineClass {
-	NotifyClass parent_class;
-};
-
-struct _NotifyGotLinePrivate {
-	gint job_id;
-	ScanLine* line;
-};
-
-struct _ScannerPrivate {
-	GThread* thread;
-	GAsyncQueue* request_queue;
-	GAsyncQueue* notify_queue;
-	GAsyncQueue* authorize_queue;
-	gchar* default_device;
-	ScanState state;
-	gboolean need_redetect;
-	GList* job_queue;
-	SANE_Handle handle;
-	gboolean have_handle;
-	gchar* current_device;
-	SANE_Parameters parameters;
-	SANE_Int option_index;
-	GHashTable* options;
-	guchar* buffer;
-	gint buffer_length1;
-	gint _buffer_size_;
-	gint n_used;
-	gint line_count;
-	gint pass_number;
-	gint page_number;
-	gint notified_page;
-	gboolean scanning;
-};
-
-struct _ParamSpecScanner {
-	GParamSpec parent_instance;
-};
-
-
-static gpointer scan_device_parent_class = NULL;
-static gpointer scan_page_info_parent_class = NULL;
-static gpointer scan_line_parent_class = NULL;
-static gpointer scan_options_parent_class = NULL;
-static gpointer scan_job_parent_class = NULL;
-static gpointer request_parent_class = NULL;
-static gpointer request_redetect_parent_class = NULL;
-static gpointer request_cancel_parent_class = NULL;
-static gpointer request_start_scan_parent_class = NULL;
-static gpointer request_quit_parent_class = NULL;
-static gpointer credentials_parent_class = NULL;
-static gpointer notify_parent_class = NULL;
-static gpointer notify_scanning_changed_parent_class = NULL;
-static gpointer notify_update_devices_parent_class = NULL;
-static gpointer notify_request_authorization_parent_class = NULL;
-static gpointer notify_scan_failed_parent_class = NULL;
-static gpointer notify_document_done_parent_class = NULL;
-static gpointer notify_expect_page_parent_class = NULL;
-static gpointer notify_got_page_info_parent_class = NULL;
-static gpointer notify_page_done_parent_class = NULL;
-static gpointer notify_got_line_parent_class = NULL;
-static gpointer scanner_parent_class = NULL;
-static Scanner* scanner_scanner_object;
-static Scanner* scanner_scanner_object = NULL;
-
-gpointer scan_device_ref (gpointer instance);
-void scan_device_unref (gpointer instance);
-GParamSpec* param_spec_scan_device (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scan_device (GValue* value, gpointer v_object);
-void value_take_scan_device (GValue* value, gpointer v_object);
-gpointer value_get_scan_device (const GValue* value);
-GType scan_device_get_type (void) G_GNUC_CONST;
-enum  {
-	SCAN_DEVICE_DUMMY_PROPERTY
-};
-ScanDevice* scan_device_new (void);
-ScanDevice* scan_device_construct (GType object_type);
-static void scan_device_finalize (ScanDevice* obj);
-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;
-enum  {
-	SCAN_PAGE_INFO_DUMMY_PROPERTY
-};
-ScanPageInfo* scan_page_info_new (void);
-ScanPageInfo* scan_page_info_construct (GType object_type);
-static void scan_page_info_finalize (ScanPageInfo* obj);
-gpointer scan_line_ref (gpointer instance);
-void scan_line_unref (gpointer instance);
-GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scan_line (GValue* value, gpointer v_object);
-void value_take_scan_line (GValue* value, gpointer v_object);
-gpointer value_get_scan_line (const GValue* value);
-GType scan_line_get_type (void) G_GNUC_CONST;
-enum  {
-	SCAN_LINE_DUMMY_PROPERTY
-};
-ScanLine* scan_line_new (void);
-ScanLine* scan_line_construct (GType object_type);
-static void scan_line_finalize (ScanLine* obj);
-GType scan_mode_get_type (void) G_GNUC_CONST;
-GType scan_type_get_type (void) G_GNUC_CONST;
-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);
-void value_set_scan_options (GValue* value, gpointer v_object);
-void value_take_scan_options (GValue* value, gpointer v_object);
-gpointer value_get_scan_options (const GValue* value);
-GType scan_options_get_type (void) G_GNUC_CONST;
-enum  {
-	SCAN_OPTIONS_DUMMY_PROPERTY
-};
-ScanOptions* scan_options_new (void);
-ScanOptions* scan_options_construct (GType object_type);
-static void scan_options_finalize (ScanOptions* obj);
-gpointer scan_job_ref (gpointer instance);
-void scan_job_unref (gpointer instance);
-GParamSpec* param_spec_scan_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scan_job (GValue* value, gpointer v_object);
-void value_take_scan_job (GValue* value, gpointer v_object);
-gpointer value_get_scan_job (const GValue* value);
-GType scan_job_get_type (void) G_GNUC_CONST;
-enum  {
-	SCAN_JOB_DUMMY_PROPERTY
-};
-ScanJob* scan_job_new (void);
-ScanJob* scan_job_construct (GType object_type);
-static void scan_job_finalize (ScanJob* obj);
-gpointer request_ref (gpointer instance);
-void request_unref (gpointer instance);
-GParamSpec* param_spec_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_request (GValue* value, gpointer v_object);
-void value_take_request (GValue* value, gpointer v_object);
-gpointer value_get_request (const GValue* value);
-GType request_get_type (void) G_GNUC_CONST;
-enum  {
-	REQUEST_DUMMY_PROPERTY
-};
-Request* request_new (void);
-Request* request_construct (GType object_type);
-static void request_finalize (Request* obj);
-GType request_redetect_get_type (void) G_GNUC_CONST;
-enum  {
-	REQUEST_REDETECT_DUMMY_PROPERTY
-};
-RequestRedetect* request_redetect_new (void);
-RequestRedetect* request_redetect_construct (GType object_type);
-GType request_cancel_get_type (void) G_GNUC_CONST;
-enum  {
-	REQUEST_CANCEL_DUMMY_PROPERTY
-};
-RequestCancel* request_cancel_new (void);
-RequestCancel* request_cancel_construct (GType object_type);
-GType request_start_scan_get_type (void) G_GNUC_CONST;
-enum  {
-	REQUEST_START_SCAN_DUMMY_PROPERTY
-};
-RequestStartScan* request_start_scan_new (void);
-RequestStartScan* request_start_scan_construct (GType object_type);
-static void request_start_scan_finalize (Request* obj);
-GType request_quit_get_type (void) G_GNUC_CONST;
-enum  {
-	REQUEST_QUIT_DUMMY_PROPERTY
-};
-RequestQuit* request_quit_new (void);
-RequestQuit* request_quit_construct (GType object_type);
-gpointer credentials_ref (gpointer instance);
-void credentials_unref (gpointer instance);
-GParamSpec* param_spec_credentials (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_credentials (GValue* value, gpointer v_object);
-void value_take_credentials (GValue* value, gpointer v_object);
-gpointer value_get_credentials (const GValue* value);
-GType credentials_get_type (void) G_GNUC_CONST;
-enum  {
-	CREDENTIALS_DUMMY_PROPERTY
-};
-Credentials* credentials_new (void);
-Credentials* credentials_construct (GType object_type);
-static void credentials_finalize (Credentials* obj);
-GType scan_state_get_type (void) G_GNUC_CONST;
-gpointer notify_ref (gpointer instance);
-void notify_unref (gpointer instance);
-GParamSpec* param_spec_notify (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_notify (GValue* value, gpointer v_object);
-void value_take_notify (GValue* value, gpointer v_object);
-gpointer value_get_notify (const GValue* value);
-GType notify_get_type (void) G_GNUC_CONST;
-gpointer scanner_ref (gpointer instance);
-void scanner_unref (gpointer instance);
-GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scanner (GValue* value, gpointer v_object);
-void value_take_scanner (GValue* value, gpointer v_object);
-gpointer value_get_scanner (const GValue* value);
-GType scanner_get_type (void) G_GNUC_CONST;
-enum  {
-	NOTIFY_DUMMY_PROPERTY
-};
-void notify_run (Notify* self, Scanner* scanner);
-static void notify_real_run (Notify* self, Scanner* scanner);
-Notify* notify_new (void);
-Notify* notify_construct (GType object_type);
-static void notify_finalize (Notify* obj);
-GType notify_scanning_changed_get_type (void) G_GNUC_CONST;
-enum  {
-	NOTIFY_SCANNING_CHANGED_DUMMY_PROPERTY
-};
-static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner);
-NotifyScanningChanged* notify_scanning_changed_new (void);
-NotifyScanningChanged* notify_scanning_changed_construct (GType object_type);
-GType notify_update_devices_get_type (void) G_GNUC_CONST;
-#define NOTIFY_UPDATE_DEVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NOTIFY_UPDATE_DEVICES, NotifyUpdateDevicesPrivate))
-enum  {
-	NOTIFY_UPDATE_DEVICES_DUMMY_PROPERTY
-};
-static void _scan_device_unref0_ (gpointer var);
-static void _g_list_free__scan_device_unref0_ (GList* self);
-NotifyUpdateDevices* notify_update_devices_new (GList* devices);
-NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList* devices);
-static void notify_update_devices_real_run (Notify* base, Scanner* scanner);
-static void notify_update_devices_finalize (Notify* obj);
-GType notify_request_authorization_get_type (void) G_GNUC_CONST;
-#define NOTIFY_REQUEST_AUTHORIZATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NOTIFY_REQUEST_AUTHORIZATION, NotifyRequestAuthorizationPrivate))
-enum  {
-	NOTIFY_REQUEST_AUTHORIZATION_DUMMY_PROPERTY
-};
-NotifyRequestAuthorization* notify_request_authorization_new (const gchar* resource);
-NotifyRequestAuthorization* notify_request_authorization_construct (GType object_type, const gchar* resource);
-static void notify_request_authorization_real_run (Notify* base, Scanner* scanner);
-static void notify_request_authorization_finalize (Notify* obj);
-GType notify_scan_failed_get_type (void) G_GNUC_CONST;
-#define NOTIFY_SCAN_FAILED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NOTIFY_SCAN_FAILED, NotifyScanFailedPrivate))
-enum  {
-	NOTIFY_SCAN_FAILED_DUMMY_PROPERTY
-};
-NotifyScanFailed* notify_scan_failed_new (gint error_code, const gchar* error_string);
-NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_code, const gchar* error_string);
-static void notify_scan_failed_real_run (Notify* base, Scanner* scanner);
-static void notify_scan_failed_finalize (Notify* obj);
-GType notify_document_done_get_type (void) G_GNUC_CONST;
-enum  {
-	NOTIFY_DOCUMENT_DONE_DUMMY_PROPERTY
-};
-static void notify_document_done_real_run (Notify* base, Scanner* scanner);
-NotifyDocumentDone* notify_document_done_new (void);
-NotifyDocumentDone* notify_document_done_construct (GType object_type);
-GType notify_expect_page_get_type (void) G_GNUC_CONST;
-enum  {
-	NOTIFY_EXPECT_PAGE_DUMMY_PROPERTY
-};
-static void notify_expect_page_real_run (Notify* base, Scanner* scanner);
-NotifyExpectPage* notify_expect_page_new (void);
-NotifyExpectPage* notify_expect_page_construct (GType object_type);
-GType notify_got_page_info_get_type (void) G_GNUC_CONST;
-#define NOTIFY_GOT_PAGE_INFO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NOTIFY_GOT_PAGE_INFO, NotifyGotPageInfoPrivate))
-enum  {
-	NOTIFY_GOT_PAGE_INFO_DUMMY_PROPERTY
-};
-NotifyGotPageInfo* notify_got_page_info_new (gint job_id, ScanPageInfo* info);
-NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_id, ScanPageInfo* info);
-static void notify_got_page_info_real_run (Notify* base, Scanner* scanner);
-static void notify_got_page_info_finalize (Notify* obj);
-GType notify_page_done_get_type (void) G_GNUC_CONST;
-#define NOTIFY_PAGE_DONE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NOTIFY_PAGE_DONE, NotifyPageDonePrivate))
-enum  {
-	NOTIFY_PAGE_DONE_DUMMY_PROPERTY
-};
-NotifyPageDone* notify_page_done_new (gint job_id);
-NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id);
-static void notify_page_done_real_run (Notify* base, Scanner* scanner);
-static void notify_page_done_finalize (Notify* obj);
-GType notify_got_line_get_type (void) G_GNUC_CONST;
-#define NOTIFY_GOT_LINE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NOTIFY_GOT_LINE, NotifyGotLinePrivate))
-enum  {
-	NOTIFY_GOT_LINE_DUMMY_PROPERTY
-};
-NotifyGotLine* notify_got_line_new (gint job_id, ScanLine* line);
-NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLine* line);
-static void notify_got_line_real_run (Notify* base, Scanner* scanner);
-static void notify_got_line_finalize (Notify* obj);
-#define SCANNER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SCANNER, ScannerPrivate))
-enum  {
-	SCANNER_DUMMY_PROPERTY
-};
-static void _scan_job_unref0_ (gpointer var);
-static void _g_list_free__scan_job_unref0_ (GList* self);
-static Scanner* scanner_new (void);
-static Scanner* scanner_construct (GType object_type);
-static void _request_unref0_ (gpointer var);
-static void _notify_unref0_ (gpointer var);
-static void _credentials_unref0_ (gpointer var);
-Scanner* scanner_get_instance (void);
-static gboolean scanner_notify_idle_cb (Scanner* self);
-static void scanner_notify (Scanner* self, Notify* notification);
-static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self);
-static void scanner_set_scanning (Scanner* self, gboolean is_scanning);
-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_);
-static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_);
-static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_);
-static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index);
-static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, const gchar* value, gchar** _result_);
-static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gchar** values, int values_length1, gchar** _result_);
-static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descriptor* option);
-static void scanner_authorization_cb (const gchar* resource, gchar* username, int username_length1, gchar* password, int password_length1);
-void scanner_authorize (Scanner* self, const gchar* username, const gchar* password);
-static void scanner_close_device (Scanner* self);
-static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* error_string);
-static gboolean scanner_handle_requests (Scanner* self);
-static void scanner_do_open (Scanner* self);
-static void _g_free0_ (gpointer var);
-static void scanner_do_get_option (Scanner* self);
-static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_Handle handle, const gchar* name, gint* index);
-static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor* option, gdouble size, gdouble dpi);
-static void scanner_do_complete_document (Scanner* self);
-static void scanner_do_start (Scanner* self);
-static void scanner_do_get_parameters (Scanner* self);
-static void scanner_do_complete_page (Scanner* self);
-static void scanner_do_read (Scanner* self);
-static void* scanner_scan_thread (Scanner* self);
-static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password);
-void scanner_redetect (Scanner* self);
-void scanner_start (Scanner* self);
-static gpointer _scanner_scan_thread_gthread_func (gpointer self);
-gboolean scanner_is_scanning (Scanner* self);
-static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode);
-static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type);
-void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options);
-void scanner_cancel (Scanner* self);
-void scanner_free (Scanner* self);
-static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (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__SCAN_LINE (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__INT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void scanner_finalize (Scanner* 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 gint _vala_array_length (gpointer array);
-
-
-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 986 "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 993 "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 1000 "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 1009 "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 1019 "scanner.c"
-	} else {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1023 "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 1031 "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 1038 "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 1045 "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 1049 "scanner.c"
-		}
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = scan_device_ref (object);
-#line 1053 "scanner.c"
-	} else {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1057 "scanner.c"
-	}
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 1061 "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 1072 "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 1078 "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 1082 "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 1086 "scanner.c"
-	}
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 1090 "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 1104 "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 1113 "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 1133 "scanner.c"
-	} else {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1137 "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 1143 "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 1162 "scanner.c"
-	} else {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1166 "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 1172 "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"
-	((ScanDeviceClass *) klass)->finalize = scan_device_finalize;
-#line 1182 "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 1189 "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 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_signal_handlers_destroy (self);
-#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 1203 "scanner.c"
-}
-
-
-GType scan_device_get_type (void) {
-	static volatile gsize scan_device_type_id__volatile = 0;
-	if (g_once_init_enter (&scan_device_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_scan_device_init, value_scan_device_free_value, value_scan_device_copy_value, value_scan_device_peek_pointer, "p", value_scan_device_collect_value, "p", value_scan_device_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (ScanDeviceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) scan_device_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ScanDevice), 0, (GInstanceInitFunc) scan_device_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 scan_device_type_id;
-		scan_device_type_id = g_type_register_fundamental (g_type_fundamental_next (), "ScanDevice", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&scan_device_type_id__volatile, scan_device_type_id);
-	}
-	return scan_device_type_id__volatile;
-}
-
-
-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 1228 "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 1241 "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 1252 "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 1259 "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 1266 "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 1275 "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 1285 "scanner.c"
-	} else {
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1289 "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 1297 "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 1304 "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 1311 "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 1315 "scanner.c"
-		}
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = scan_page_info_ref (object);
-#line 1319 "scanner.c"
-	} else {
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1323 "scanner.c"
-	}
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 1327 "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 1338 "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 1344 "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 1348 "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 1352 "scanner.c"
-	}
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 1356 "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 1370 "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 1379 "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 1399 "scanner.c"
-	} else {
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1403 "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 1409 "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 1428 "scanner.c"
-	} else {
-#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1432 "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 1438 "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"
-	((ScanPageInfoClass *) klass)->finalize = scan_page_info_finalize;
-#line 1448 "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 1455 "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 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_signal_handlers_destroy (self);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (self->device);
-#line 1467 "scanner.c"
-}
-
-
-GType scan_page_info_get_type (void) {
-	static volatile gsize scan_page_info_type_id__volatile = 0;
-	if (g_once_init_enter (&scan_page_info_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_scan_page_info_init, value_scan_page_info_free_value, value_scan_page_info_copy_value, value_scan_page_info_peek_pointer, "p", value_scan_page_info_collect_value, "p", value_scan_page_info_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (ScanPageInfoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) scan_page_info_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ScanPageInfo), 0, (GInstanceInitFunc) scan_page_info_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 scan_page_info_type_id;
-		scan_page_info_type_id = g_type_register_fundamental (g_type_fundamental_next (), "ScanPageInfo", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&scan_page_info_type_id__volatile, scan_page_info_type_id);
-	}
-	return scan_page_info_type_id__volatile;
-}
-
-
-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 1492 "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 1505 "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 1516 "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 1523 "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 1530 "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 1539 "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 1549 "scanner.c"
-	} else {
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1553 "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 1561 "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 1568 "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 1575 "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 1579 "scanner.c"
-		}
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = scan_line_ref (object);
-#line 1583 "scanner.c"
-	} else {
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1587 "scanner.c"
-	}
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 1591 "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 1602 "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 1608 "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 1612 "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 1616 "scanner.c"
-	}
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 1620 "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 1634 "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 1643 "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 1663 "scanner.c"
-	} else {
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1667 "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 1673 "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 1692 "scanner.c"
-	} else {
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1696 "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 1702 "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"
-	((ScanLineClass *) klass)->finalize = scan_line_finalize;
-#line 1712 "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 1719 "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 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_signal_handlers_destroy (self);
-#line 55 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->data = (g_free (self->data), NULL);
-#line 1731 "scanner.c"
-}
-
-
-GType scan_line_get_type (void) {
-	static volatile gsize scan_line_type_id__volatile = 0;
-	if (g_once_init_enter (&scan_line_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_scan_line_init, value_scan_line_free_value, value_scan_line_copy_value, value_scan_line_peek_pointer, "p", value_scan_line_collect_value, "p", value_scan_line_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (ScanLineClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) scan_line_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ScanLine), 0, (GInstanceInitFunc) scan_line_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 scan_line_type_id;
-		scan_line_type_id = g_type_register_fundamental (g_type_fundamental_next (), "ScanLine", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&scan_line_type_id__volatile, scan_line_type_id);
-	}
-	return scan_line_type_id__volatile;
-}
-
-
-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 1756 "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 1769 "scanner.c"
-	}
-}
-
-
-GType scan_mode_get_type (void) {
-	static volatile gsize scan_mode_type_id__volatile = 0;
-	if (g_once_init_enter (&scan_mode_type_id__volatile)) {
-		static const GEnumValue values[] = {{SCAN_MODE_DEFAULT, "SCAN_MODE_DEFAULT", "default"}, {SCAN_MODE_COLOR, "SCAN_MODE_COLOR", "color"}, {SCAN_MODE_GRAY, "SCAN_MODE_GRAY", "gray"}, {SCAN_MODE_LINEART, "SCAN_MODE_LINEART", "lineart"}, {0, NULL, NULL}};
-		GType scan_mode_type_id;
-		scan_mode_type_id = g_enum_register_static ("ScanMode", values);
-		g_once_init_leave (&scan_mode_type_id__volatile, scan_mode_type_id);
-	}
-	return scan_mode_type_id__volatile;
-}
-
-
-GType scan_type_get_type (void) {
-	static volatile gsize scan_type_type_id__volatile = 0;
-	if (g_once_init_enter (&scan_type_type_id__volatile)) {
-		static const GEnumValue values[] = {{SCAN_TYPE_SINGLE, "SCAN_TYPE_SINGLE", "single"}, {SCAN_TYPE_ADF_FRONT, "SCAN_TYPE_ADF_FRONT", "adf-front"}, {SCAN_TYPE_ADF_BACK, "SCAN_TYPE_ADF_BACK", "adf-back"}, {SCAN_TYPE_ADF_BOTH, "SCAN_TYPE_ADF_BOTH", "adf-both"}, {0, NULL, NULL}};
-		GType scan_type_type_id;
-		scan_type_type_id = g_enum_register_static ("ScanType", values);
-		g_once_init_leave (&scan_type_type_id__volatile, scan_type_type_id);
-	}
-	return scan_type_type_id__volatile;
-}
-
-
-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 1804 "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 1811 "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 1818 "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 1827 "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 1837 "scanner.c"
-	} else {
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1841 "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 1849 "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 1856 "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 1863 "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 1867 "scanner.c"
-		}
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = scan_options_ref (object);
-#line 1871 "scanner.c"
-	} else {
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1875 "scanner.c"
-	}
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 1879 "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 1890 "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 1896 "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 1900 "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 1904 "scanner.c"
-	}
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 1908 "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 1922 "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 1931 "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 1951 "scanner.c"
-	} else {
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1955 "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 1961 "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 1980 "scanner.c"
-	} else {
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 1984 "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 1990 "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"
-	((ScanOptionsClass *) klass)->finalize = scan_options_finalize;
-#line 2000 "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 2007 "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 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_signal_handlers_destroy (self);
-#line 2017 "scanner.c"
-}
-
-
-GType scan_options_get_type (void) {
-	static volatile gsize scan_options_type_id__volatile = 0;
-	if (g_once_init_enter (&scan_options_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_scan_options_init, value_scan_options_free_value, value_scan_options_copy_value, value_scan_options_peek_pointer, "p", value_scan_options_collect_value, "p", value_scan_options_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (ScanOptionsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) scan_options_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ScanOptions), 0, (GInstanceInitFunc) scan_options_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 scan_options_type_id;
-		scan_options_type_id = g_type_register_fundamental (g_type_fundamental_next (), "ScanOptions", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&scan_options_type_id__volatile, scan_options_type_id);
-	}
-	return scan_options_type_id__volatile;
-}
-
-
-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 2042 "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 2055 "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 2066 "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 2073 "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 2080 "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 2089 "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 2099 "scanner.c"
-	} else {
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 2103 "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 2111 "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 2118 "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 2125 "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 2129 "scanner.c"
-		}
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = scan_job_ref (object);
-#line 2133 "scanner.c"
-	} else {
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 2137 "scanner.c"
-	}
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 2141 "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 2152 "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 2158 "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 2162 "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 2166 "scanner.c"
-	}
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 2170 "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 2184 "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 2193 "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 2213 "scanner.c"
-	} else {
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 2217 "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 2223 "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 2242 "scanner.c"
-	} else {
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 2246 "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 2252 "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"
-	((ScanJobClass *) klass)->finalize = scan_job_finalize;
-#line 2262 "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 2269 "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 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_signal_handlers_destroy (self);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (self->device);
-#line 2281 "scanner.c"
-}
-
-
-GType scan_job_get_type (void) {
-	static volatile gsize scan_job_type_id__volatile = 0;
-	if (g_once_init_enter (&scan_job_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_scan_job_init, value_scan_job_free_value, value_scan_job_copy_value, value_scan_job_peek_pointer, "p", value_scan_job_collect_value, "p", value_scan_job_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (ScanJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) scan_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ScanJob), 0, (GInstanceInitFunc) scan_job_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 scan_job_type_id;
-		scan_job_type_id = g_type_register_fundamental (g_type_fundamental_next (), "ScanJob", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&scan_job_type_id__volatile, scan_job_type_id);
-	}
-	return scan_job_type_id__volatile;
-}
-
-
-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 2306 "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 2319 "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 2330 "scanner.c"
-}
-
-
-Request* request_new (void) {
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return request_construct (TYPE_REQUEST);
-#line 2337 "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 2344 "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 2353 "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 2363 "scanner.c"
-	} else {
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 2367 "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 2375 "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 2382 "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 2389 "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 2393 "scanner.c"
-		}
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = request_ref (object);
-#line 2397 "scanner.c"
-	} else {
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 2401 "scanner.c"
-	}
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 2405 "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 2416 "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 2422 "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 2426 "scanner.c"
-	} else {
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		*object_p = request_ref (value->data[0].v_pointer);
-#line 2430 "scanner.c"
-	}
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 2434 "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 2448 "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 2457 "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 2477 "scanner.c"
-	} else {
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 2481 "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 2487 "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 2506 "scanner.c"
-	} else {
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 2510 "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 2516 "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"
-	((RequestClass *) klass)->finalize = request_finalize;
-#line 2526 "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 2533 "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 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_signal_handlers_destroy (self);
-#line 2543 "scanner.c"
-}
-
-
-GType request_get_type (void) {
-	static volatile gsize request_type_id__volatile = 0;
-	if (g_once_init_enter (&request_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_request_init, value_request_free_value, value_request_copy_value, value_request_peek_pointer, "p", value_request_collect_value, "p", value_request_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (RequestClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) request_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Request), 0, (GInstanceInitFunc) request_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 request_type_id;
-		request_type_id = g_type_register_fundamental (g_type_fundamental_next (), "Request", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&request_type_id__volatile, request_type_id);
-	}
-	return request_type_id__volatile;
-}
-
-
-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 2568 "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 2581 "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 2592 "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 2599 "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 2606 "scanner.c"
-}
-
-
-static void request_redetect_instance_init (RequestRedetect * self) {
-}
-
-
-GType request_redetect_get_type (void) {
-	static volatile gsize request_redetect_type_id__volatile = 0;
-	if (g_once_init_enter (&request_redetect_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (RequestRedetectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) request_redetect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RequestRedetect), 0, (GInstanceInitFunc) request_redetect_instance_init, NULL };
-		GType request_redetect_type_id;
-		request_redetect_type_id = g_type_register_static (TYPE_REQUEST, "RequestRedetect", &g_define_type_info, 0);
-		g_once_init_leave (&request_redetect_type_id__volatile, request_redetect_type_id);
-	}
-	return request_redetect_type_id__volatile;
-}
-
-
-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 2632 "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 2639 "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 2646 "scanner.c"
-}
-
-
-static void request_cancel_instance_init (RequestCancel * self) {
-}
-
-
-GType request_cancel_get_type (void) {
-	static volatile gsize request_cancel_type_id__volatile = 0;
-	if (g_once_init_enter (&request_cancel_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (RequestCancelClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) request_cancel_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RequestCancel), 0, (GInstanceInitFunc) request_cancel_instance_init, NULL };
-		GType request_cancel_type_id;
-		request_cancel_type_id = g_type_register_static (TYPE_REQUEST, "RequestCancel", &g_define_type_info, 0);
-		g_once_init_leave (&request_cancel_type_id__volatile, request_cancel_type_id);
-	}
-	return request_cancel_type_id__volatile;
-}
-
-
-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 2672 "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 2679 "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"
-	((RequestClass *) klass)->finalize = request_start_scan_finalize;
-#line 2688 "scanner.c"
-}
-
-
-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 2704 "scanner.c"
-}
-
-
-GType request_start_scan_get_type (void) {
-	static volatile gsize request_start_scan_type_id__volatile = 0;
-	if (g_once_init_enter (&request_start_scan_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (RequestStartScanClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) request_start_scan_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RequestStartScan), 0, (GInstanceInitFunc) request_start_scan_instance_init, NULL };
-		GType request_start_scan_type_id;
-		request_start_scan_type_id = g_type_register_static (TYPE_REQUEST, "RequestStartScan", &g_define_type_info, 0);
-		g_once_init_leave (&request_start_scan_type_id__volatile, request_start_scan_type_id);
-	}
-	return request_start_scan_type_id__volatile;
-}
-
-
-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 2726 "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 2733 "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 2740 "scanner.c"
-}
-
-
-static void request_quit_instance_init (RequestQuit * self) {
-}
-
-
-GType request_quit_get_type (void) {
-	static volatile gsize request_quit_type_id__volatile = 0;
-	if (g_once_init_enter (&request_quit_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (RequestQuitClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) request_quit_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RequestQuit), 0, (GInstanceInitFunc) request_quit_instance_init, NULL };
-		GType request_quit_type_id;
-		request_quit_type_id = g_type_register_static (TYPE_REQUEST, "RequestQuit", &g_define_type_info, 0);
-		g_once_init_leave (&request_quit_type_id__volatile, request_quit_type_id);
-	}
-	return request_quit_type_id__volatile;
-}
-
-
-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 2766 "scanner.c"
-}
-
-
-Credentials* credentials_new (void) {
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return credentials_construct (TYPE_CREDENTIALS);
-#line 2773 "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 2780 "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 2789 "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 2799 "scanner.c"
-	} else {
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 2803 "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 2811 "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 2818 "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 2825 "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 2829 "scanner.c"
-		}
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = credentials_ref (object);
-#line 2833 "scanner.c"
-	} else {
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 2837 "scanner.c"
-	}
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 2841 "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 2852 "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 2858 "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 2862 "scanner.c"
-	} else {
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		*object_p = credentials_ref (value->data[0].v_pointer);
-#line 2866 "scanner.c"
-	}
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 2870 "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 2884 "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 2893 "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 2913 "scanner.c"
-	} else {
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 2917 "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 2923 "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 2942 "scanner.c"
-	} else {
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 2946 "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 2952 "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"
-	((CredentialsClass *) klass)->finalize = credentials_finalize;
-#line 2962 "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 2969 "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 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_signal_handlers_destroy (self);
-#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 2983 "scanner.c"
-}
-
-
-GType credentials_get_type (void) {
-	static volatile gsize credentials_type_id__volatile = 0;
-	if (g_once_init_enter (&credentials_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_credentials_init, value_credentials_free_value, value_credentials_copy_value, value_credentials_peek_pointer, "p", value_credentials_collect_value, "p", value_credentials_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (CredentialsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) credentials_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Credentials), 0, (GInstanceInitFunc) credentials_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 credentials_type_id;
-		credentials_type_id = g_type_register_fundamental (g_type_fundamental_next (), "Credentials", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&credentials_type_id__volatile, credentials_type_id);
-	}
-	return credentials_type_id__volatile;
-}
-
-
-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 3008 "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 3021 "scanner.c"
-	}
-}
-
-
-GType scan_state_get_type (void) {
-	static volatile gsize scan_state_type_id__volatile = 0;
-	if (g_once_init_enter (&scan_state_type_id__volatile)) {
-		static const GEnumValue values[] = {{SCAN_STATE_IDLE, "SCAN_STATE_IDLE", "idle"}, {SCAN_STATE_REDETECT, "SCAN_STATE_REDETECT", "redetect"}, {SCAN_STATE_OPEN, "SCAN_STATE_OPEN", "open"}, {SCAN_STATE_GET_OPTION, "SCAN_STATE_GET_OPTION", "get-option"}, {SCAN_STATE_START, "SCAN_STATE_START", "start"}, {SCAN_STATE_GET_PARAMETERS, "SCAN_STATE_GET_PARAMETERS", "get-parameters"}, {SCAN_STATE_READ, "SCAN_STATE_READ", "read"}, {0, NULL, NULL}};
-		GType scan_state_type_id;
-		scan_state_type_id = g_enum_register_static ("ScanState", values);
-		g_once_init_leave (&scan_state_type_id__volatile, scan_state_type_id);
-	}
-	return scan_state_type_id__volatile;
-}
-
-
-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 3041 "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 3050 "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 3060 "scanner.c"
-}
-
-
-Notify* notify_new (void) {
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return notify_construct (TYPE_NOTIFY);
-#line 3067 "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 3074 "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 3083 "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 3093 "scanner.c"
-	} else {
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 3097 "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 3105 "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 3112 "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 3119 "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 3123 "scanner.c"
-		}
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = notify_ref (object);
-#line 3127 "scanner.c"
-	} else {
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 3131 "scanner.c"
-	}
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 3135 "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 3146 "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 3152 "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 3156 "scanner.c"
-	} else {
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		*object_p = notify_ref (value->data[0].v_pointer);
-#line 3160 "scanner.c"
-	}
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 3164 "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 3178 "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 3187 "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 3207 "scanner.c"
-	} else {
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 3211 "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 3217 "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 3236 "scanner.c"
-	} else {
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 3240 "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 3246 "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"
-	((NotifyClass *) klass)->finalize = notify_finalize;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_real_run;
-#line 3258 "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 3265 "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 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_signal_handlers_destroy (self);
-#line 3275 "scanner.c"
-}
-
-
-GType notify_get_type (void) {
-	static volatile gsize notify_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_notify_init, value_notify_free_value, value_notify_copy_value, value_notify_peek_pointer, "p", value_notify_collect_value, "p", value_notify_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Notify), 0, (GInstanceInitFunc) notify_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 notify_type_id;
-		notify_type_id = g_type_register_fundamental (g_type_fundamental_next (), "Notify", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&notify_type_id__volatile, notify_type_id);
-	}
-	return notify_type_id__volatile;
-}
-
-
-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 3300 "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 3313 "scanner.c"
-	}
-}
-
-
-static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
-	NotifyScanningChanged * self;
-	Scanner* _tmp0_ = NULL;
-#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 3329 "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 3339 "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 3346 "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"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_scanning_changed_real_run;
-#line 3355 "scanner.c"
-}
-
-
-static void notify_scanning_changed_instance_init (NotifyScanningChanged * self) {
-}
-
-
-GType notify_scanning_changed_get_type (void) {
-	static volatile gsize notify_scanning_changed_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_scanning_changed_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyScanningChangedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_scanning_changed_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotifyScanningChanged), 0, (GInstanceInitFunc) notify_scanning_changed_instance_init, NULL };
-		GType notify_scanning_changed_type_id;
-		notify_scanning_changed_type_id = g_type_register_static (TYPE_NOTIFY, "NotifyScanningChanged", &g_define_type_info, 0);
-		g_once_init_leave (&notify_scanning_changed_type_id__volatile, notify_scanning_changed_type_id);
-	}
-	return notify_scanning_changed_type_id__volatile;
-}
-
-
-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 3378 "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 3387 "scanner.c"
-}
-
-
-NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList* devices) {
-	NotifyUpdateDevices* self = NULL;
-	GList* _tmp0_ = NULL;
-#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 3408 "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 3415 "scanner.c"
-}
-
-
-static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
-	NotifyUpdateDevices * self;
-	Scanner* _tmp0_ = NULL;
-	GList* _tmp1_ = NULL;
-#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 3433 "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"
-	((NotifyClass *) 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"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_update_devices_real_run;
-#line 3446 "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 3453 "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 3465 "scanner.c"
-}
-
-
-GType notify_update_devices_get_type (void) {
-	static volatile gsize notify_update_devices_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_update_devices_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyUpdateDevicesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_update_devices_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotifyUpdateDevices), 0, (GInstanceInitFunc) notify_update_devices_instance_init, NULL };
-		GType notify_update_devices_type_id;
-		notify_update_devices_type_id = g_type_register_static (TYPE_NOTIFY, "NotifyUpdateDevices", &g_define_type_info, 0);
-		g_once_init_leave (&notify_update_devices_type_id__volatile, notify_update_devices_type_id);
-	}
-	return notify_update_devices_type_id__volatile;
-}
-
-
-NotifyRequestAuthorization* notify_request_authorization_construct (GType object_type, const gchar* resource) {
-	NotifyRequestAuthorization* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#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 3499 "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 3506 "scanner.c"
-}
-
-
-static void notify_request_authorization_real_run (Notify* base, Scanner* scanner) {
-	NotifyRequestAuthorization * self;
-	Scanner* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#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 3524 "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"
-	((NotifyClass *) 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"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_request_authorization_real_run;
-#line 3537 "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 3544 "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 3556 "scanner.c"
-}
-
-
-GType notify_request_authorization_get_type (void) {
-	static volatile gsize notify_request_authorization_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_request_authorization_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyRequestAuthorizationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_request_authorization_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotifyRequestAuthorization), 0, (GInstanceInitFunc) notify_request_authorization_instance_init, NULL };
-		GType notify_request_authorization_type_id;
-		notify_request_authorization_type_id = g_type_register_static (TYPE_NOTIFY, "NotifyRequestAuthorization", &g_define_type_info, 0);
-		g_once_init_leave (&notify_request_authorization_type_id__volatile, notify_request_authorization_type_id);
-	}
-	return notify_request_authorization_type_id__volatile;
-}
-
-
-NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_code, const gchar* error_string) {
-	NotifyScanFailed* self = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-#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 3595 "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 3602 "scanner.c"
-}
-
-
-static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
-	NotifyScanFailed * self;
-	Scanner* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-#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 3623 "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"
-	((NotifyClass *) 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"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_scan_failed_real_run;
-#line 3636 "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 3643 "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 3655 "scanner.c"
-}
-
-
-GType notify_scan_failed_get_type (void) {
-	static volatile gsize notify_scan_failed_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_scan_failed_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyScanFailedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_scan_failed_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotifyScanFailed), 0, (GInstanceInitFunc) notify_scan_failed_instance_init, NULL };
-		GType notify_scan_failed_type_id;
-		notify_scan_failed_type_id = g_type_register_static (TYPE_NOTIFY, "NotifyScanFailed", &g_define_type_info, 0);
-		g_once_init_leave (&notify_scan_failed_type_id__volatile, notify_scan_failed_type_id);
-	}
-	return notify_scan_failed_type_id__volatile;
-}
-
-
-static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
-	NotifyDocumentDone * self;
-	Scanner* _tmp0_ = NULL;
-#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 3682 "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 3692 "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 3699 "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"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_document_done_real_run;
-#line 3708 "scanner.c"
-}
-
-
-static void notify_document_done_instance_init (NotifyDocumentDone * self) {
-}
-
-
-GType notify_document_done_get_type (void) {
-	static volatile gsize notify_document_done_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_document_done_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyDocumentDoneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_document_done_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotifyDocumentDone), 0, (GInstanceInitFunc) notify_document_done_instance_init, NULL };
-		GType notify_document_done_type_id;
-		notify_document_done_type_id = g_type_register_static (TYPE_NOTIFY, "NotifyDocumentDone", &g_define_type_info, 0);
-		g_once_init_leave (&notify_document_done_type_id__volatile, notify_document_done_type_id);
-	}
-	return notify_document_done_type_id__volatile;
-}
-
-
-static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
-	NotifyExpectPage * self;
-	Scanner* _tmp0_ = NULL;
-#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 3739 "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 3749 "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 3756 "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"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_expect_page_real_run;
-#line 3765 "scanner.c"
-}
-
-
-static void notify_expect_page_instance_init (NotifyExpectPage * self) {
-}
-
-
-GType notify_expect_page_get_type (void) {
-	static volatile gsize notify_expect_page_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_expect_page_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyExpectPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_expect_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotifyExpectPage), 0, (GInstanceInitFunc) notify_expect_page_instance_init, NULL };
-		GType notify_expect_page_type_id;
-		notify_expect_page_type_id = g_type_register_static (TYPE_NOTIFY, "NotifyExpectPage", &g_define_type_info, 0);
-		g_once_init_leave (&notify_expect_page_type_id__volatile, notify_expect_page_type_id);
-	}
-	return notify_expect_page_type_id__volatile;
-}
-
-
-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 3788 "scanner.c"
-}
-
-
-NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_id, ScanPageInfo* info) {
-	NotifyGotPageInfo* self = NULL;
-	gint _tmp0_ = 0;
-	ScanPageInfo* _tmp1_ = NULL;
-	ScanPageInfo* _tmp2_ = NULL;
-#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 3815 "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 3822 "scanner.c"
-}
-
-
-static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
-	NotifyGotPageInfo * self;
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	Scanner* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-#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 3844 "scanner.c"
-		gint _tmp4_ = 0;
-		Scanner* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-#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 3856 "scanner.c"
-	} else {
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = FALSE;
-#line 3860 "scanner.c"
-	}
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp0_) {
-#line 3864 "scanner.c"
-		Scanner* _tmp7_ = NULL;
-		ScanPageInfo* _tmp8_ = NULL;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = scanner;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = self->priv->info;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_signal_emit_by_name (_tmp7_, "got-page-info", _tmp8_);
-#line 3873 "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"
-	((NotifyClass *) 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"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_got_page_info_real_run;
-#line 3887 "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 3894 "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 3906 "scanner.c"
-}
-
-
-GType notify_got_page_info_get_type (void) {
-	static volatile gsize notify_got_page_info_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_got_page_info_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyGotPageInfoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_got_page_info_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotifyGotPageInfo), 0, (GInstanceInitFunc) notify_got_page_info_instance_init, NULL };
-		GType notify_got_page_info_type_id;
-		notify_got_page_info_type_id = g_type_register_static (TYPE_NOTIFY, "NotifyGotPageInfo", &g_define_type_info, 0);
-		g_once_init_leave (&notify_got_page_info_type_id__volatile, notify_got_page_info_type_id);
-	}
-	return notify_got_page_info_type_id__volatile;
-}
-
-
-NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
-	NotifyPageDone* self = NULL;
-	gint _tmp0_ = 0;
-#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 3933 "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 3940 "scanner.c"
-}
-
-
-static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
-	NotifyPageDone * self;
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	Scanner* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-#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 3962 "scanner.c"
-		gint _tmp4_ = 0;
-		Scanner* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-#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 3974 "scanner.c"
-	} else {
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = FALSE;
-#line 3978 "scanner.c"
-	}
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp0_) {
-#line 3982 "scanner.c"
-		Scanner* _tmp7_ = NULL;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = scanner;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_signal_emit_by_name (_tmp7_, "page-done");
-#line 3988 "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"
-	((NotifyClass *) 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"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_page_done_real_run;
-#line 4002 "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 4009 "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 4019 "scanner.c"
-}
-
-
-GType notify_page_done_get_type (void) {
-	static volatile gsize notify_page_done_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_page_done_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyPageDoneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_page_done_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotifyPageDone), 0, (GInstanceInitFunc) notify_page_done_instance_init, NULL };
-		GType notify_page_done_type_id;
-		notify_page_done_type_id = g_type_register_static (TYPE_NOTIFY, "NotifyPageDone", &g_define_type_info, 0);
-		g_once_init_leave (&notify_page_done_type_id__volatile, notify_page_done_type_id);
-	}
-	return notify_page_done_type_id__volatile;
-}
-
-
-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 4038 "scanner.c"
-}
-
-
-NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLine* line) {
-	NotifyGotLine* self = NULL;
-	gint _tmp0_ = 0;
-	ScanLine* _tmp1_ = NULL;
-	ScanLine* _tmp2_ = NULL;
-#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 4065 "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 4072 "scanner.c"
-}
-
-
-static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
-	NotifyGotLine * self;
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	Scanner* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-#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 4094 "scanner.c"
-		gint _tmp4_ = 0;
-		Scanner* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-#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 4106 "scanner.c"
-	} else {
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = FALSE;
-#line 4110 "scanner.c"
-	}
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp0_) {
-#line 4114 "scanner.c"
-		Scanner* _tmp7_ = NULL;
-		ScanLine* _tmp8_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = scanner;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = self->priv->line;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_signal_emit_by_name (_tmp7_, "got-line", _tmp8_);
-#line 4123 "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"
-	((NotifyClass *) 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"
-	((NotifyClass *) klass)->run = (void (*)(Notify*, Scanner*)) notify_got_line_real_run;
-#line 4137 "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 4144 "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 4156 "scanner.c"
-}
-
-
-GType notify_got_line_get_type (void) {
-	static volatile gsize notify_got_line_type_id__volatile = 0;
-	if (g_once_init_enter (&notify_got_line_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (NotifyGotLineClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notify_got_line_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotifyGotLine), 0, (GInstanceInitFunc) notify_got_line_instance_init, NULL };
-		GType notify_got_line_type_id;
-		notify_got_line_type_id = g_type_register_static (TYPE_NOTIFY, "NotifyGotLine", &g_define_type_info, 0);
-		g_once_init_leave (&notify_got_line_type_id__volatile, notify_got_line_type_id);
-	}
-	return notify_got_line_type_id__volatile;
-}
-
-
-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 4175 "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 4184 "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 4191 "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 4198 "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 4205 "scanner.c"
-}
-
-
-static Scanner* scanner_construct (GType object_type) {
-	Scanner* self = NULL;
-	GAsyncQueue* _tmp0_ = NULL;
-	GAsyncQueue* _tmp1_ = NULL;
-	GAsyncQueue* _tmp2_ = NULL;
-#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 4236 "scanner.c"
-}
-
-
-static Scanner* scanner_new (void) {
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return scanner_construct (TYPE_SCANNER);
-#line 4243 "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 4250 "scanner.c"
-}
-
-
-Scanner* scanner_get_instance (void) {
-	Scanner* result = NULL;
-	Scanner* _tmp0_ = NULL;
-	Scanner* _tmp2_ = NULL;
-	Scanner* _tmp3_ = NULL;
-#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 4263 "scanner.c"
-		Scanner* _tmp1_ = NULL;
-#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 4271 "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 4281 "scanner.c"
-}
-
-
-static gboolean scanner_notify_idle_cb (Scanner* self) {
-	gboolean result = FALSE;
-	Notify* notification = NULL;
-	GAsyncQueue* _tmp0_ = NULL;
-	gpointer _tmp1_ = NULL;
-#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 4306 "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 4313 "scanner.c"
-}
-
-
-static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
-	gboolean result;
-	result = scanner_notify_idle_cb ((Scanner*) self);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return result;
-#line 4322 "scanner.c"
-}
-
-
-static void scanner_notify (Scanner* self, Notify* notification) {
-	GAsyncQueue* _tmp0_ = NULL;
-	Notify* _tmp1_ = NULL;
-	Notify* _tmp2_ = NULL;
-#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 4344 "scanner.c"
-}
-
-
-static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#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 4358 "scanner.c"
-		gboolean _tmp3_ = FALSE;
-#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 4364 "scanner.c"
-	} else {
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp1_ = FALSE;
-#line 4368 "scanner.c"
-	}
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp1_) {
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = TRUE;
-#line 4374 "scanner.c"
-	} else {
-		gboolean _tmp4_ = FALSE;
-		gboolean _tmp5_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp5_ = self->priv->scanning;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (!_tmp5_) {
-#line 4382 "scanner.c"
-			gboolean _tmp6_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp6_ = is_scanning;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp4_ = _tmp6_;
-#line 4388 "scanner.c"
-		} else {
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp4_ = FALSE;
-#line 4392 "scanner.c"
-		}
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = _tmp4_;
-#line 4396 "scanner.c"
-	}
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp0_) {
-#line 4400 "scanner.c"
-		gboolean _tmp7_ = FALSE;
-		NotifyScanningChanged* _tmp8_ = NULL;
-		NotifyScanningChanged* _tmp9_ = NULL;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = is_scanning;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->scanning = _tmp7_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = notify_scanning_changed_new ();
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp9_ = _tmp8_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_notify (self, (Notify*) _tmp9_);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_notify_unref0 (_tmp9_);
-#line 4416 "scanner.c"
-	}
-}
-
-
-static gboolean string_contains (const gchar* self, const gchar* needle) {
-	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 4437 "scanner.c"
-}
-
-
-static gint scanner_get_device_weight (const gchar* device) {
-	gint result = 0;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	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 4459 "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 4471 "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 4477 "scanner.c"
-}
-
-
-static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
-	gint result = 0;
-	gint weight1 = 0;
-	ScanDevice* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint weight2 = 0;
-	ScanDevice* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	GCompareFunc _tmp10_ = NULL;
-	ScanDevice* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	ScanDevice* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	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 4525 "scanner.c"
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-#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 4536 "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 4554 "scanner.c"
-}
-
-
-static gchar* sane_status_to_string (SANE_Status status) {
-	gchar* result = NULL;
-	SANE_Status _tmp0_ = 0;
-#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 4567 "scanner.c"
-		{
-			gchar* _tmp1_ = NULL;
-#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 4576 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_UNSUPPORTED:
-#line 4580 "scanner.c"
-		{
-			gchar* _tmp2_ = NULL;
-#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 4589 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_CANCELLED:
-#line 4593 "scanner.c"
-		{
-			gchar* _tmp3_ = NULL;
-#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 4602 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_DEVICE_BUSY:
-#line 4606 "scanner.c"
-		{
-			gchar* _tmp4_ = NULL;
-#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 4615 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_INVAL:
-#line 4619 "scanner.c"
-		{
-			gchar* _tmp5_ = NULL;
-#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 4628 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_EOF:
-#line 4632 "scanner.c"
-		{
-			gchar* _tmp6_ = NULL;
-#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 4641 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_JAMMED:
-#line 4645 "scanner.c"
-		{
-			gchar* _tmp7_ = NULL;
-#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 4654 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_NO_DOCS:
-#line 4658 "scanner.c"
-		{
-			gchar* _tmp8_ = NULL;
-#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 4667 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_COVER_OPEN:
-#line 4671 "scanner.c"
-		{
-			gchar* _tmp9_ = NULL;
-#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 4680 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_IO_ERROR:
-#line 4684 "scanner.c"
-		{
-			gchar* _tmp10_ = NULL;
-#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 4693 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_NO_MEM:
-#line 4697 "scanner.c"
-		{
-			gchar* _tmp11_ = NULL;
-#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 4706 "scanner.c"
-		}
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_STATUS_ACCESS_DENIED:
-#line 4710 "scanner.c"
-		{
-			gchar* _tmp12_ = NULL;
-#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 4719 "scanner.c"
-		}
-		default:
-		{
-			SANE_Status _tmp13_ = 0;
-			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 4733 "scanner.c"
-		}
-	}
-}
-
-
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
-	gchar* result = NULL;
-	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4748 "scanner.c"
-	{
-		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4779 "scanner.c"
-				goto __catch15_g_regex_error;
-			}
-#line 1382 "/usr/share/vala-0.34/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 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			return NULL;
-#line 4788 "scanner.c"
-		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4804 "scanner.c"
-				goto __catch15_g_regex_error;
-			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/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 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			return NULL;
-#line 4815 "scanner.c"
-		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 4829 "scanner.c"
-	}
-	goto __finally15;
-	__catch15_g_regex_error:
-	{
-		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_error_free0 (e);
-#line 4843 "scanner.c"
-	}
-	__finally15:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/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 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return NULL;
-#line 4854 "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 4862 "scanner.c"
-}
-
-
-static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpointer b) {
-	gint result;
-	result = scanner_compare_devices ((ScanDevice*) a, (ScanDevice*) b);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return result;
-#line 4871 "scanner.c"
-}
-
-
-static void scanner_do_redetect (Scanner* self) {
-	SANE_Device** device_list = NULL;
-	gint device_list_length1 = 0;
-	gint _device_list_size_ = 0;
-	SANE_Status status = 0;
-	SANE_Device** _tmp0_ = NULL;
-	SANE_Status _tmp1_ = 0;
-	SANE_Status _tmp2_ = 0;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	SANE_Status _tmp5_ = 0;
-	GList* devices = NULL;
-	GList* _tmp56_ = NULL;
-	GList* _tmp63_ = NULL;
-	NotifyUpdateDevices* _tmp64_ = NULL;
-	NotifyUpdateDevices* _tmp65_ = NULL;
-#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_;
-#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 4923 "scanner.c"
-		SANE_Status _tmp6_ = 0;
-		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_);
-#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 4938 "scanner.c"
-	}
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	devices = NULL;
-#line 4942 "scanner.c"
-	{
-		gint i = 0;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		i = 0;
-#line 4947 "scanner.c"
-		{
-			gboolean _tmp8_ = FALSE;
-#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 4954 "scanner.c"
-				SANE_Device** _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				gint _tmp11_ = 0;
-				SANE_Device* _tmp12_ = NULL;
-				SANE_Device** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
-				gint _tmp14_ = 0;
-				SANE_Device* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-				SANE_Device** _tmp17_ = NULL;
-				gint _tmp17__length1 = 0;
-				gint _tmp18_ = 0;
-				SANE_Device* _tmp19_ = NULL;
-				const gchar* _tmp20_ = NULL;
-				SANE_Device** _tmp21_ = NULL;
-				gint _tmp21__length1 = 0;
-				gint _tmp22_ = 0;
-				SANE_Device* _tmp23_ = NULL;
-				const gchar* _tmp24_ = NULL;
-				SANE_Device** _tmp25_ = NULL;
-				gint _tmp25__length1 = 0;
-				gint _tmp26_ = 0;
-				SANE_Device* _tmp27_ = NULL;
-				const gchar* _tmp28_ = NULL;
-				ScanDevice* scan_device = NULL;
-				ScanDevice* _tmp29_ = NULL;
-				ScanDevice* _tmp30_ = NULL;
-				SANE_Device** _tmp31_ = NULL;
-				gint _tmp31__length1 = 0;
-				gint _tmp32_ = 0;
-				SANE_Device* _tmp33_ = NULL;
-				const gchar* _tmp34_ = NULL;
-				gchar* _tmp35_ = NULL;
-				gchar* vendor = NULL;
-				SANE_Device** _tmp36_ = NULL;
-				gint _tmp36__length1 = 0;
-				gint _tmp37_ = 0;
-				SANE_Device* _tmp38_ = NULL;
-				const gchar* _tmp39_ = NULL;
-				gchar* _tmp40_ = NULL;
-				const gchar* _tmp41_ = NULL;
-				ScanDevice* _tmp43_ = NULL;
-				const gchar* _tmp44_ = NULL;
-				SANE_Device** _tmp45_ = NULL;
-				gint _tmp45__length1 = 0;
-				gint _tmp46_ = 0;
-				SANE_Device* _tmp47_ = NULL;
-				const gchar* _tmp48_ = NULL;
-				gchar* _tmp49_ = NULL;
-				ScanDevice* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				gchar* _tmp52_ = NULL;
-				gchar* _tmp53_ = NULL;
-				ScanDevice* _tmp54_ = NULL;
-				ScanDevice* _tmp55_ = NULL;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp8_) {
-#line 5012 "scanner.c"
-					gint _tmp9_ = 0;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp9_ = i;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					i = _tmp9_ + 1;
-#line 5018 "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"
-				_tmp10_ = device_list;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp10__length1 = device_list_length1;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp11_ = i;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp12_ = _tmp10_[_tmp11_];
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!(_tmp12_ != NULL)) {
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 5034 "scanner.c"
-				}
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp13_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp13__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp14_ = i;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp15_ = _tmp13_[_tmp14_];
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp16_ = _tmp15_->name;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp17_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp17__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp18_ = i;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp19_ = _tmp17_[_tmp18_];
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp20_ = _tmp19_->vendor;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp21_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp21__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp22_ = i;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp23_ = _tmp21_[_tmp22_];
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp24_ = _tmp23_->model;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp25_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp25__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp26_ = i;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp27_ = _tmp25_[_tmp26_];
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp28_ = _tmp27_->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\"", _tmp16_, _tmp20_, _tmp24_, _tmp28_);
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp29_ = scan_device_new ();
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scan_device = _tmp29_;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp30_ = scan_device;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp31_ = device_list;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp31__length1 = device_list_length1;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp32_ = i;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp33_ = _tmp31_[_tmp32_];
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp34_ = _tmp33_->name;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp35_ = g_strdup (_tmp34_);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (_tmp30_->name);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp30_->name = _tmp35_;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp36_ = device_list;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp36__length1 = device_list_length1;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp37_ = i;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp38_ = _tmp36_[_tmp37_];
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp39_ = _tmp38_->vendor;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp40_ = g_strdup (_tmp39_);
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				vendor = _tmp40_;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp41_ = vendor;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (g_strcmp0 (_tmp41_, "Hewlett-Packard") == 0) {
-#line 5118 "scanner.c"
-					gchar* _tmp42_ = NULL;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp42_ = 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 = _tmp42_;
-#line 5126 "scanner.c"
-				}
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp43_ = scan_device;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp44_ = vendor;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp45_ = device_list;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp45__length1 = device_list_length1;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp46_ = i;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp47_ = _tmp45_[_tmp46_];
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp48_ = _tmp47_->model;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp49_ = g_strdup_printf ("%s %s", _tmp44_, _tmp48_);
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (_tmp43_->label);
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp43_->label = _tmp49_;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp50_ = scan_device;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp51_ = _tmp50_->label;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp52_ = string_replace (_tmp51_, "_", " ");
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp53_ = _tmp52_;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (_tmp53_);
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp54_ = scan_device;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp55_ = _scan_device_ref0 (_tmp54_);
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				devices = g_list_append (devices, _tmp55_);
-#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 5168 "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"
-	_tmp56_ = devices;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp56_ != NULL) {
-#line 5182 "scanner.c"
-		ScanDevice* device = NULL;
-		GList* _tmp57_ = NULL;
-		gconstpointer _tmp58_ = NULL;
-		ScanDevice* _tmp59_ = NULL;
-		ScanDevice* _tmp60_ = NULL;
-		const gchar* _tmp61_ = NULL;
-		gchar* _tmp62_ = NULL;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp57_ = devices;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp58_ = g_list_nth_data (_tmp57_, (guint) 0);
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp59_ = _scan_device_ref0 ((ScanDevice*) _tmp58_);
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		device = _tmp59_;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp60_ = device;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp61_ = _tmp60_->name;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp62_ = g_strdup (_tmp61_);
-#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 = _tmp62_;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_device_unref0 (device);
-#line 5210 "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 5216 "scanner.c"
-	}
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp63_ = 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"
-	_tmp64_ = notify_update_devices_new (_tmp63_);
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp65_ = _tmp64_;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_notify (self, (Notify*) _tmp65_);
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_notify_unref0 (_tmp65_);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	__g_list_free__scan_device_unref0_0 (devices);
-#line 5232 "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 v = 0;
-	gint _tmp0_ = 0;
-	SANE_Option_Descriptor* _tmp1_ = NULL;
-	SANE_Value_Type _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
-	SANE_Option_Descriptor* _tmp5_ = NULL;
-	SANE_Constraint_Type _tmp6_ = 0;
-#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 5268 "scanner.c"
-		SANE_Option_Descriptor* _tmp7_ = NULL;
-		SANE_Range* _tmp8_ = NULL;
-		SANE_Word _tmp9_ = {0};
-		SANE_Option_Descriptor* _tmp10_ = NULL;
-		SANE_Range* _tmp11_ = NULL;
-		SANE_Word _tmp12_ = {0};
-#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 5289 "scanner.c"
-	} else {
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp4_ = FALSE;
-#line 5293 "scanner.c"
-	}
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp4_) {
-#line 5297 "scanner.c"
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		gint _tmp15_ = 0;
-		SANE_Option_Descriptor* _tmp16_ = NULL;
-		SANE_Range* _tmp17_ = NULL;
-		SANE_Word _tmp18_ = {0};
-		SANE_Option_Descriptor* _tmp19_ = NULL;
-		SANE_Range* _tmp20_ = NULL;
-		SANE_Word _tmp21_ = {0};
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
-		SANE_Option_Descriptor* _tmp26_ = NULL;
-		SANE_Range* _tmp27_ = NULL;
-		SANE_Word _tmp28_ = {0};
-		gint _tmp29_ = 0;
-		gint _tmp30_ = 0;
-		gint _tmp31_ = 0;
-		gint _tmp32_ = 0;
-		SANE_Option_Descriptor* _tmp33_ = NULL;
-		SANE_Range* _tmp34_ = NULL;
-		SANE_Word _tmp35_ = {0};
-		SANE_Option_Descriptor* _tmp36_ = NULL;
-		SANE_Range* _tmp37_ = NULL;
-		SANE_Word _tmp38_ = {0};
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp13_ = v;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = source_min;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		v = _tmp13_ - _tmp14_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp15_ = v;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp16_ = option;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp17_ = _tmp16_->constraint.range;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp18_ = _tmp17_->max;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp19_ = option;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp20_ = _tmp19_->constraint.range;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp21_ = _tmp20_->min;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		v = _tmp15_ * ((gint) (_tmp18_ - _tmp21_));
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp22_ = v;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp23_ = source_max;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp24_ = source_min;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		v = _tmp22_ / (_tmp23_ - _tmp24_);
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp25_ = v;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp26_ = option;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp27_ = _tmp26_->constraint.range;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp28_ = _tmp27_->min;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		v = _tmp25_ + ((gint) _tmp28_);
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp29_ = value;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp30_ = source_min;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp31_ = source_max;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp32_ = v;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp33_ = option;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp34_ = _tmp33_->constraint.range;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp35_ = _tmp34_->min;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp36_ = option;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp37_ = _tmp36_->constraint.range;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp38_ = _tmp37_->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]", _tmp29_, _tmp30_, _tmp31_, _tmp32_, (gint) _tmp35_, (gint) _tmp38_);
-#line 5386 "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 5392 "scanner.c"
-}
-
-
-static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index) {
-	gboolean result = FALSE;
-	SANE_Option_Descriptor* _tmp0_ = NULL;
-	SANE_Int _tmp1_ = {0};
-	SANE_Status status = 0;
-	SANE_Handle _tmp2_ = {0};
-	SANE_Int _tmp3_ = {0};
-	SANE_Status _tmp4_ = 0;
-	SANE_Int _tmp5_ = {0};
-	SANE_Status _tmp6_ = 0;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	SANE_Status _tmp9_ = 0;
-	SANE_Status _tmp14_ = 0;
-#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 5424 "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_;
-#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 5450 "scanner.c"
-		SANE_Option_Descriptor* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		SANE_Status _tmp12_ = 0;
-		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_);
-#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 5465 "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 5473 "scanner.c"
-}
-
-
-static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gboolean value, gboolean* _result_) {
-	gboolean _vala_result = FALSE;
-	SANE_Option_Descriptor* _tmp0_ = NULL;
-	SANE_Value_Type _tmp1_ = 0;
-	SANE_Bool v = {0};
-	gboolean _tmp2_ = FALSE;
-	SANE_Status status = 0;
-	SANE_Handle _tmp3_ = {0};
-	SANE_Int _tmp4_ = {0};
-	SANE_Status _tmp5_ = 0;
-	SANE_Bool _tmp6_ = {0};
-	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	SANE_Int _tmp11_ = {0};
-	SANE_Status _tmp12_ = 0;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-#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 5528 "scanner.c"
-	} else {
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = "SANE_FALSE";
-#line 5532 "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 5540 "scanner.c"
-	} else {
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp9_ = "SANE_FALSE";
-#line 5544 "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_ = status;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp13_ = sane_status_to_string (_tmp12_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp14_ = _tmp13_;
-#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_, _tmp7_, _tmp14_, _tmp9_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp14_);
-#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 5562 "scanner.c"
-	}
-}
-
-
-static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gint value, gint* _result_) {
-	gint _vala_result = 0;
-	SANE_Option_Descriptor* _tmp0_ = NULL;
-	SANE_Value_Type _tmp1_ = 0;
-	SANE_Int v = {0};
-	gint _tmp2_ = 0;
-	SANE_Option_Descriptor* _tmp3_ = NULL;
-	SANE_Constraint_Type _tmp4_ = 0;
-	SANE_Status status = 0;
-	SANE_Handle _tmp47_ = {0};
-	SANE_Int _tmp48_ = {0};
-	SANE_Status _tmp49_ = 0;
-	SANE_Int _tmp50_ = {0};
-	gint _tmp51_ = 0;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	SANE_Int _tmp54_ = {0};
-	SANE_Int _tmp55_ = {0};
-#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 5605 "scanner.c"
-		SANE_Option_Descriptor* _tmp5_ = NULL;
-		SANE_Range* _tmp6_ = NULL;
-		SANE_Word _tmp7_ = {0};
-		SANE_Int _tmp12_ = {0};
-		SANE_Option_Descriptor* _tmp13_ = NULL;
-		SANE_Range* _tmp14_ = NULL;
-		SANE_Word _tmp15_ = {0};
-		SANE_Int _tmp19_ = {0};
-		SANE_Option_Descriptor* _tmp20_ = NULL;
-		SANE_Range* _tmp21_ = NULL;
-		SANE_Word _tmp22_ = {0};
-#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 5625 "scanner.c"
-			SANE_Int _tmp8_ = {0};
-			SANE_Option_Descriptor* _tmp9_ = NULL;
-			SANE_Range* _tmp10_ = NULL;
-			SANE_Word _tmp11_ = {0};
-#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 5640 "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 5652 "scanner.c"
-			SANE_Option_Descriptor* _tmp16_ = NULL;
-			SANE_Range* _tmp17_ = NULL;
-			SANE_Word _tmp18_ = {0};
-#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 5664 "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 5676 "scanner.c"
-			SANE_Option_Descriptor* _tmp23_ = NULL;
-			SANE_Range* _tmp24_ = NULL;
-			SANE_Word _tmp25_ = {0};
-#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 5688 "scanner.c"
-		}
-	} else {
-		SANE_Option_Descriptor* _tmp26_ = NULL;
-		SANE_Constraint_Type _tmp27_ = 0;
-#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 5699 "scanner.c"
-			gint distance = 0;
-			gint nearest = 0;
-			gint _tmp46_ = 0;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			distance = G_MAXINT;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			nearest = 0;
-#line 5707 "scanner.c"
-			{
-				gint i = 0;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				i = 0;
-#line 5712 "scanner.c"
-				{
-					gboolean _tmp28_ = FALSE;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp28_ = TRUE;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					while (TRUE) {
-#line 5719 "scanner.c"
-						gint _tmp30_ = 0;
-						SANE_Option_Descriptor* _tmp31_ = NULL;
-						SANE_Word* _tmp32_ = NULL;
-						gint _tmp32__length1 = 0;
-						SANE_Word _tmp33_ = {0};
-						gint x = 0;
-						SANE_Option_Descriptor* _tmp34_ = NULL;
-						SANE_Word* _tmp35_ = NULL;
-						gint _tmp35__length1 = 0;
-						gint _tmp36_ = 0;
-						SANE_Word _tmp37_ = {0};
-						gint d = 0;
-						gint _tmp38_ = 0;
-						SANE_Int _tmp39_ = {0};
-						gint _tmp40_ = 0;
-						gint _tmp41_ = 0;
-						gint _tmp42_ = 0;
-						gint _tmp43_ = 0;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp28_) {
-#line 5740 "scanner.c"
-							gint _tmp29_ = 0;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp29_ = i;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp29_ + 1;
-#line 5746 "scanner.c"
-						}
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp28_ = FALSE;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp30_ = i;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp31_ = option;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp32_ = _tmp31_->constraint.word_list;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp32__length1 = -1;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33_ = _tmp32_[0];
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp30_) < _tmp33_)) {
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							break;
-#line 5764 "scanner.c"
-						}
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp34_ = option;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp35_ = _tmp34_->constraint.word_list;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp35__length1 = -1;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp36_ = i;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp37_ = _tmp35_[_tmp36_ + 1];
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						x = (gint) _tmp37_;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp38_ = x;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp39_ = v;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						d = (gint) (_tmp38_ - _tmp39_);
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp40_ = d;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp41_ = abs (_tmp40_);
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						d = _tmp41_;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp42_ = d;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp43_ = distance;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp42_ < _tmp43_) {
-#line 5796 "scanner.c"
-							gint _tmp44_ = 0;
-							gint _tmp45_ = 0;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp44_ = d;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							distance = _tmp44_;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp45_ = x;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							nearest = _tmp45_;
-#line 5807 "scanner.c"
-						}
-					}
-				}
-			}
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp46_ = nearest;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			v = (SANE_Int) _tmp46_;
-#line 5816 "scanner.c"
-		}
-	}
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp47_ = handle;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_ = option_index;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = sane_control_option (_tmp47_, _tmp48_, SANE_ACTION_SET_VALUE, &v, NULL);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp49_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = option_index;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = value;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_ = sane_status_to_string (status);
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp53_ = _tmp52_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp54_ = v;
-#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) _tmp50_, _tmp51_, _tmp53_, (gint) _tmp54_);
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp53_);
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp55_ = v;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = (gint) _tmp55_;
-#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 5849 "scanner.c"
-	}
-}
-
-
-static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_) {
-	gdouble _vala_result = 0.0;
-	gdouble v = 0.0;
-	gdouble _tmp0_ = 0.0;
-	SANE_Fixed v_fixed = {0};
-	SANE_Option_Descriptor* _tmp1_ = NULL;
-	SANE_Value_Type _tmp2_ = 0;
-	SANE_Option_Descriptor* _tmp3_ = NULL;
-	SANE_Constraint_Type _tmp4_ = 0;
-	gdouble _tmp41_ = 0.0;
-	SANE_Fixed _tmp42_ = {0};
-	SANE_Status status = 0;
-	SANE_Handle _tmp43_ = {0};
-	SANE_Int _tmp44_ = {0};
-	SANE_Status _tmp45_ = 0;
-	SANE_Int _tmp46_ = {0};
-	gdouble _tmp47_ = 0.0;
-	gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
-	gdouble _tmp50_ = 0.0;
-	gdouble _tmp51_ = 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 5895 "scanner.c"
-		gdouble min = 0.0;
-		SANE_Option_Descriptor* _tmp5_ = NULL;
-		SANE_Range* _tmp6_ = NULL;
-		SANE_Word _tmp7_ = {0};
-		gdouble _tmp8_ = 0.0;
-		gdouble max = 0.0;
-		SANE_Option_Descriptor* _tmp9_ = NULL;
-		SANE_Range* _tmp10_ = NULL;
-		SANE_Word _tmp11_ = {0};
-		gdouble _tmp12_ = 0.0;
-		gdouble _tmp13_ = 0.0;
-		gdouble _tmp14_ = 0.0;
-		gdouble _tmp16_ = 0.0;
-		gdouble _tmp17_ = 0.0;
-#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 5936 "scanner.c"
-			gdouble _tmp15_ = 0.0;
-#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 5942 "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 5950 "scanner.c"
-			gdouble _tmp18_ = 0.0;
-#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 5956 "scanner.c"
-		}
-	} else {
-		SANE_Option_Descriptor* _tmp19_ = NULL;
-		SANE_Constraint_Type _tmp20_ = 0;
-#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 5967 "scanner.c"
-			gdouble distance = 0.0;
-			gdouble nearest = 0.0;
-			gdouble _tmp40_ = 0.0;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			distance = DBL_MAX;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			nearest = 0.0;
-#line 5975 "scanner.c"
-			{
-				gint i = 0;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				i = 0;
-#line 5980 "scanner.c"
-				{
-					gboolean _tmp21_ = FALSE;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp21_ = TRUE;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					while (TRUE) {
-#line 5987 "scanner.c"
-						gint _tmp23_ = 0;
-						SANE_Option_Descriptor* _tmp24_ = NULL;
-						SANE_Word* _tmp25_ = NULL;
-						gint _tmp25__length1 = 0;
-						SANE_Word _tmp26_ = {0};
-						gdouble x = 0.0;
-						SANE_Option_Descriptor* _tmp27_ = NULL;
-						SANE_Word* _tmp28_ = NULL;
-						gint _tmp28__length1 = 0;
-						gint _tmp29_ = 0;
-						SANE_Word _tmp30_ = {0};
-						gdouble _tmp31_ = 0.0;
-						gdouble _tmp32_ = 0.0;
-						gdouble _tmp33_ = 0.0;
-						gdouble _tmp34_ = 0.0;
-						gdouble _tmp35_ = 0.0;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp21_) {
-#line 6006 "scanner.c"
-							gint _tmp22_ = 0;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp22_ = i;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp22_ + 1;
-#line 6012 "scanner.c"
-						}
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp21_ = FALSE;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp23_ = i;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp24_ = option;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp25_ = _tmp24_->constraint.word_list;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp25__length1 = -1;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp26_ = _tmp25_[0];
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp23_) < _tmp26_)) {
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							break;
-#line 6030 "scanner.c"
-						}
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp27_ = option;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp28_ = _tmp27_->constraint.word_list;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp28__length1 = -1;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp29_ = i;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp30_ = _tmp28_[_tmp29_ + 1];
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp31_ = SANE_UNFIX ((SANE_Fixed) _tmp30_);
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						x = _tmp31_;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp32_ = x;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33_ = v;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp34_ = fabs (_tmp32_ - _tmp33_);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp35_ = distance;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp34_ < _tmp35_) {
-#line 6056 "scanner.c"
-							gdouble _tmp36_ = 0.0;
-							gdouble _tmp37_ = 0.0;
-							gdouble _tmp38_ = 0.0;
-							gdouble _tmp39_ = 0.0;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp36_ = x;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp37_ = v;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp38_ = fabs (_tmp36_ - _tmp37_);
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							distance = _tmp38_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp39_ = x;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							nearest = _tmp39_;
-#line 6073 "scanner.c"
-						}
-					}
-				}
-			}
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp40_ = nearest;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			v = _tmp40_;
-#line 6082 "scanner.c"
-		}
-	}
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp41_ = v;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_ = SANE_FIX (_tmp41_);
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	v_fixed = _tmp42_;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = handle;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp44_ = option_index;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp45_ = sane_control_option (_tmp43_, _tmp44_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp45_;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp46_ = option_index;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp47_ = value;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_ = sane_status_to_string (status);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = _tmp48_;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = SANE_UNFIX (v_fixed);
-#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) _tmp46_, _tmp47_, _tmp49_, _tmp50_);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp49_);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = SANE_UNFIX (v_fixed);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = _tmp51_;
-#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 6121 "scanner.c"
-	}
-}
-
-
-static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_) {
-	gdouble _vala_result = 0.0;
-	SANE_Option_Descriptor* _tmp0_ = NULL;
-	SANE_Value_Type _tmp1_ = 0;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (option != NULL);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = option;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = _tmp0_->type;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp1_ == SANE_TYPE_FIXED) {
-#line 6140 "scanner.c"
-		SANE_Handle _tmp2_ = {0};
-		SANE_Option_Descriptor* _tmp3_ = NULL;
-		SANE_Int _tmp4_ = {0};
-		gdouble _tmp5_ = 0.0;
-		gdouble _tmp6_ = 0.0;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp2_ = handle;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp3_ = option;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp4_ = option_index;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp5_ = value;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_set_fixed_option (self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_vala_result = _tmp6_;
-#line 6158 "scanner.c"
-	} else {
-		SANE_Option_Descriptor* _tmp7_ = NULL;
-		SANE_Value_Type _tmp8_ = 0;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = option;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = _tmp7_->type;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp8_ == SANE_TYPE_INT) {
-#line 6168 "scanner.c"
-			gint r = 0;
-			SANE_Handle _tmp9_ = {0};
-			SANE_Option_Descriptor* _tmp10_ = NULL;
-			SANE_Int _tmp11_ = {0};
-			gdouble _tmp12_ = 0.0;
-			gdouble _tmp13_ = 0.0;
-			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp9_ = handle;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp10_ = option;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp11_ = option_index;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp12_ = value;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp13_ = round (_tmp12_);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			scanner_set_int_option (self, _tmp9_, _tmp10_, _tmp11_, (gint) _tmp13_, &_tmp14_);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			r = _tmp14_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp15_ = r;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_vala_result = (gdouble) _tmp15_;
-#line 6195 "scanner.c"
-		} else {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_vala_result = 0.0;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:520: Unable to set unsupported option type");
-#line 6201 "scanner.c"
-		}
-	}
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_result_) {
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		*_result_ = _vala_result;
-#line 6208 "scanner.c"
-	}
-}
-
-
-static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index) {
-	SANE_Option_Descriptor* _tmp0_ = NULL;
-	SANE_Constraint_Type _tmp1_ = 0;
-	SANE_Status status = 0;
-	SANE_Handle _tmp2_ = {0};
-	SANE_Int _tmp3_ = {0};
-	SANE_Option_Descriptor* _tmp4_ = NULL;
-	SANE_Range* _tmp5_ = NULL;
-	SANE_Status _tmp6_ = 0;
-	SANE_Int _tmp7_ = {0};
-	SANE_Status _tmp8_ = 0;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (option != NULL);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = option;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = _tmp0_->constraint_type;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp1_ != SANE_CONSTRAINT_RANGE) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 6238 "scanner.c"
-	}
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = handle;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = option_index;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = option;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = _tmp4_->constraint.range;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = sane_control_option (_tmp2_, _tmp3_, SANE_ACTION_SET_VALUE, &_tmp5_->max, NULL);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp6_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = option_index;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp8_ = status;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp9_ = sane_status_to_string (_tmp8_);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp10_ = _tmp9_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:530: sane_control_option (%d, SANE_ACTION_SET_VALUE, opti" \
-"on.range.max) -> (%s)", (gint) _tmp7_, _tmp10_);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp10_);
-#line 6264 "scanner.c"
-}
-
-
-static gchar string_get (const gchar* self, glong index) {
-	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 6282 "scanner.c"
-}
-
-
-static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, const gchar* value, gchar** _result_) {
-	gchar* _vala_result = NULL;
-	gboolean result = FALSE;
-	gchar* _tmp0_ = NULL;
-	SANE_Option_Descriptor* _tmp1_ = NULL;
-	SANE_Value_Type _tmp2_ = 0;
-	gchar* s = NULL;
-	SANE_Option_Descriptor* _tmp3_ = NULL;
-	SANE_Int _tmp4_ = {0};
-	gchar* _tmp5_ = NULL;
-	gint s_length1 = 0;
-	gint _s_size_ = 0;
-	gint i = 0;
-	gchar* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	gint _tmp22_ = 0;
-	gchar _tmp23_ = '\0';
-	SANE_Status status = 0;
-	SANE_Handle _tmp24_ = {0};
-	SANE_Int _tmp25_ = {0};
-	gchar* _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	SANE_Status _tmp27_ = 0;
-	gchar* _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	gchar* _tmp29_ = NULL;
-	SANE_Int _tmp30_ = {0};
-	const gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	gchar* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (option != NULL, FALSE);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (value != NULL, FALSE);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = g_strdup ("");
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_vala_result);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = _tmp0_;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = option;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = _tmp1_->type;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (_tmp2_ == SANE_TYPE_STRING, FALSE);
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = option;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = _tmp3_->size;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = g_new0 (gchar, _tmp4_);
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	s = _tmp5_;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	s_length1 = _tmp4_;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_s_size_ = s_length1;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	i = 0;
-#line 6349 "scanner.c"
-	{
-		gboolean _tmp6_ = FALSE;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp6_ = TRUE;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		while (TRUE) {
-#line 6356 "scanner.c"
-			gboolean _tmp8_ = FALSE;
-			gint _tmp9_ = 0;
-			SANE_Option_Descriptor* _tmp10_ = NULL;
-			SANE_Int _tmp11_ = {0};
-			gchar* _tmp15_ = NULL;
-			gint _tmp15__length1 = 0;
-			gint _tmp16_ = 0;
-			const gchar* _tmp17_ = NULL;
-			gint _tmp18_ = 0;
-			gchar _tmp19_ = '\0';
-			gchar _tmp20_ = '\0';
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (!_tmp6_) {
-#line 6370 "scanner.c"
-				gint _tmp7_ = 0;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp7_ = i;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				i = _tmp7_ + 1;
-#line 6376 "scanner.c"
-			}
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp6_ = FALSE;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp9_ = i;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp10_ = option;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp11_ = _tmp10_->size;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (((SANE_Int) _tmp9_) < (_tmp11_ - 1)) {
-#line 6388 "scanner.c"
-				const gchar* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gchar _tmp14_ = '\0';
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp12_ = value;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp13_ = i;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp8_ = _tmp14_ != '\0';
-#line 6400 "scanner.c"
-			} else {
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp8_ = FALSE;
-#line 6404 "scanner.c"
-			}
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (!_tmp8_) {
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 6410 "scanner.c"
-			}
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp15_ = s;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp15__length1 = s_length1;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp16_ = i;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp17_ = value;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp18_ = i;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp19_ = string_get (_tmp17_, (glong) _tmp18_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp15_[_tmp16_] = _tmp19_;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp20_ = _tmp15_[_tmp16_];
-#line 6428 "scanner.c"
-		}
-	}
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp21_ = s;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp21__length1 = s_length1;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp22_ = i;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp21_[_tmp22_] = '\0';
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp23_ = _tmp21_[_tmp22_];
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp24_ = handle;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_ = option_index;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26_ = s;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26__length1 = s_length1;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_ = sane_control_option (_tmp24_, _tmp25_, SANE_ACTION_SET_VALUE, _tmp26_, NULL);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp27_;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28_ = s;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28__length1 = s_length1;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp29_ = g_strdup ((const gchar*) _tmp28_);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_vala_result);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = _tmp29_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_ = option_index;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp31_ = value;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp32_ = sane_status_to_string (status);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_ = _tmp32_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp34_ = _vala_result;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:546: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
-"\") -> (%s, \"%s\")", (gint) _tmp30_, _tmp31_, _tmp33_, _tmp34_);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp33_);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	result = status == SANE_STATUS_GOOD;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	s = (g_free (s), NULL);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_result_) {
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		*_result_ = _vala_result;
-#line 6485 "scanner.c"
-	} else {
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (_vala_result);
-#line 6489 "scanner.c"
-	}
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return result;
-#line 6493 "scanner.c"
-}
-
-
-static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gchar** values, int values_length1, gchar** _result_) {
-	gchar* _vala_result = NULL;
-	gboolean result = FALSE;
-	SANE_Option_Descriptor* _tmp0_ = NULL;
-	SANE_Value_Type _tmp1_ = 0;
-	SANE_Option_Descriptor* _tmp2_ = NULL;
-	SANE_Constraint_Type _tmp3_ = 0;
-	gchar* _tmp34_ = NULL;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (option != NULL, FALSE);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = option;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = _tmp0_->type;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (_tmp1_ == SANE_TYPE_STRING, FALSE);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = option;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = _tmp2_->constraint_type;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
-#line 6521 "scanner.c"
-	{
-		gint i = 0;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		i = 0;
-#line 6526 "scanner.c"
-		{
-			gboolean _tmp4_ = FALSE;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp4_ = TRUE;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			while (TRUE) {
-#line 6533 "scanner.c"
-				gchar** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				const gchar* _tmp8_ = NULL;
-				gint j = 0;
-				SANE_Option_Descriptor* _tmp22_ = NULL;
-				gchar** _tmp23_ = NULL;
-				gint _tmp23__length1 = 0;
-				gint _tmp24_ = 0;
-				const gchar* _tmp25_ = NULL;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp4_) {
-#line 6546 "scanner.c"
-					gint _tmp5_ = 0;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp5_ = i;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					i = _tmp5_ + 1;
-#line 6552 "scanner.c"
-				}
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp4_ = FALSE;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp6_ = values;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp6__length1 = values_length1;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp7_ = i;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp8_ = _tmp6_[_tmp7_];
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!(_tmp8_ != NULL)) {
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 6568 "scanner.c"
-				}
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				j = 0;
-#line 6572 "scanner.c"
-				{
-					gboolean _tmp9_ = FALSE;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp9_ = TRUE;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					while (TRUE) {
-#line 6579 "scanner.c"
-						SANE_Option_Descriptor* _tmp11_ = NULL;
-						gchar** _tmp12_ = NULL;
-						gint _tmp12__length1 = 0;
-						gint _tmp13_ = 0;
-						const gchar* _tmp14_ = NULL;
-						gchar** _tmp15_ = NULL;
-						gint _tmp15__length1 = 0;
-						gint _tmp16_ = 0;
-						const gchar* _tmp17_ = NULL;
-						SANE_Option_Descriptor* _tmp18_ = NULL;
-						gchar** _tmp19_ = NULL;
-						gint _tmp19__length1 = 0;
-						gint _tmp20_ = 0;
-						const gchar* _tmp21_ = NULL;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp9_) {
-#line 6596 "scanner.c"
-							gint _tmp10_ = 0;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp10_ = j;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							j = _tmp10_ + 1;
-#line 6602 "scanner.c"
-						}
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp9_ = FALSE;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp11_ = option;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp12_ = _tmp11_->constraint.string_list;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp12__length1 = _vala_array_length (_tmp11_->constraint.string_list);
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp13_ = j;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp14_ = _tmp12_[_tmp13_];
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(_tmp14_ != NULL)) {
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							break;
-#line 6620 "scanner.c"
-						}
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp15_ = values;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp15__length1 = values_length1;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp16_ = i;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp17_ = _tmp15_[_tmp16_];
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp18_ = option;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp19_ = _tmp18_->constraint.string_list;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp19__length1 = _vala_array_length (_tmp18_->constraint.string_list);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp20_ = j;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp21_ = _tmp19_[_tmp20_];
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (g_strcmp0 (_tmp17_, _tmp21_) == 0) {
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							break;
-#line 6644 "scanner.c"
-						}
-					}
-				}
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp22_ = option;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp23_ = _tmp22_->constraint.string_list;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp23__length1 = _vala_array_length (_tmp22_->constraint.string_list);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp24_ = j;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp25_ = _tmp23_[_tmp24_];
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp25_ != NULL) {
-#line 6660 "scanner.c"
-					SANE_Handle _tmp26_ = {0};
-					SANE_Option_Descriptor* _tmp27_ = NULL;
-					SANE_Int _tmp28_ = {0};
-					gchar** _tmp29_ = NULL;
-					gint _tmp29__length1 = 0;
-					gint _tmp30_ = 0;
-					const gchar* _tmp31_ = NULL;
-					gchar* _tmp32_ = NULL;
-					gboolean _tmp33_ = FALSE;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp26_ = handle;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp27_ = option;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp28_ = option_index;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp29_ = values;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp29__length1 = values_length1;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp30_ = i;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp31_ = _tmp29_[_tmp30_];
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp33_ = scanner_set_string_option (self, _tmp26_, _tmp27_, _tmp28_, _tmp31_, &_tmp32_);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_g_free0 (_vala_result);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_vala_result = _tmp32_;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					result = _tmp33_;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (_result_) {
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						*_result_ = _vala_result;
-#line 6696 "scanner.c"
-					} else {
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_g_free0 (_vala_result);
-#line 6700 "scanner.c"
-					}
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					return result;
-#line 6704 "scanner.c"
-				}
-			}
-		}
-	}
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp34_ = g_strdup ("");
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_vala_result);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = _tmp34_;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	result = FALSE;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_result_) {
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		*_result_ = _vala_result;
-#line 6721 "scanner.c"
-	} else {
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (_vala_result);
-#line 6725 "scanner.c"
-	}
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return result;
-#line 6729 "scanner.c"
-}
-
-
-static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descriptor* option) {
-	gchar* s = NULL;
-	SANE_Int _tmp0_ = {0};
-	gchar* _tmp1_ = NULL;
-	SANE_Option_Descriptor* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	SANE_Option_Descriptor* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	SANE_Option_Descriptor* _tmp18_ = NULL;
-	SANE_Value_Type _tmp19_ = 0;
-	const gchar* _tmp38_ = NULL;
-	SANE_Option_Descriptor* _tmp39_ = NULL;
-	SANE_Int _tmp40_ = {0};
-	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
-	SANE_Option_Descriptor* _tmp44_ = NULL;
-	SANE_Unit _tmp45_ = 0;
-	SANE_Option_Descriptor* _tmp64_ = NULL;
-	SANE_Constraint_Type _tmp65_ = 0;
-	SANE_Int cap = {0};
-	SANE_Option_Descriptor* _tmp149_ = NULL;
-	SANE_Int _tmp150_ = {0};
-	SANE_Int _tmp151_ = {0};
-	const gchar* _tmp216_ = NULL;
-	SANE_Option_Descriptor* _tmp217_ = NULL;
-	const gchar* _tmp218_ = NULL;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (option != NULL);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = index;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = g_strdup_printf ("Option %d:", (gint) _tmp0_);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	s = _tmp1_;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = option;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = _tmp2_->name;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (g_strcmp0 (_tmp3_, "") != 0) {
-#line 6776 "scanner.c"
-		const gchar* _tmp4_ = NULL;
-		SANE_Option_Descriptor* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp4_ = s;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp5_ = option;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp6_ = _tmp5_->name;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = g_strdup_printf (" name='%s'", _tmp6_);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = _tmp7_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp9_ = g_strconcat (_tmp4_, _tmp8_, 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 = _tmp9_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (_tmp8_);
-#line 6801 "scanner.c"
-	}
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp10_ = option;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp11_ = _tmp10_->title;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (g_strcmp0 (_tmp11_, "") != 0) {
-#line 6809 "scanner.c"
-		const gchar* _tmp12_ = NULL;
-		SANE_Option_Descriptor* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp12_ = s;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp13_ = option;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = _tmp13_->title;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp15_ = g_strdup_printf (" title='%s'", _tmp14_);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp16_ = _tmp15_;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp17_ = g_strconcat (_tmp12_, _tmp16_, NULL);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (s);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		s = _tmp17_;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (_tmp16_);
-#line 6834 "scanner.c"
-	}
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp18_ = option;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp19_ = _tmp18_->type;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	switch (_tmp19_) {
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_TYPE_BOOL:
-#line 6844 "scanner.c"
-		{
-			const gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp20_ = s;
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp21_ = g_strconcat (_tmp20_, " type=bool", NULL);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp21_;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 6858 "scanner.c"
-		}
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_TYPE_INT:
-#line 6862 "scanner.c"
-		{
-			const gchar* _tmp22_ = NULL;
-			gchar* _tmp23_ = NULL;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp22_ = s;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp23_ = g_strconcat (_tmp22_, " type=int", 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 = _tmp23_;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 6876 "scanner.c"
-		}
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_TYPE_FIXED:
-#line 6880 "scanner.c"
-		{
-			const gchar* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp24_ = s;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp25_ = g_strconcat (_tmp24_, " type=fixed", 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 = _tmp25_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 6894 "scanner.c"
-		}
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_TYPE_STRING:
-#line 6898 "scanner.c"
-		{
-			const gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp26_ = s;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp27_ = g_strconcat (_tmp26_, " type=string", 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 = _tmp27_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 6912 "scanner.c"
-		}
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_TYPE_BUTTON:
-#line 6916 "scanner.c"
-		{
-			const gchar* _tmp28_ = NULL;
-			gchar* _tmp29_ = NULL;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp28_ = s;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_ = g_strconcat (_tmp28_, " type=button", 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 = _tmp29_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 6930 "scanner.c"
-		}
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_TYPE_GROUP:
-#line 6934 "scanner.c"
-		{
-			const gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp30_ = s;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp31_ = g_strconcat (_tmp30_, " type=group", 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 = _tmp31_;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 6948 "scanner.c"
-		}
-		default:
-		{
-			const gchar* _tmp32_ = NULL;
-			SANE_Option_Descriptor* _tmp33_ = NULL;
-			SANE_Value_Type _tmp34_ = 0;
-			gchar* _tmp35_ = NULL;
-			gchar* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp32_ = s;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp33_ = option;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp34_ = _tmp33_->type;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp35_ = g_strdup_printf (" type=%d", (gint) _tmp34_);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp36_ = _tmp35_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp37_ = g_strconcat (_tmp32_, _tmp36_, 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 = _tmp37_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (_tmp36_);
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 6978 "scanner.c"
-		}
-	}
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp38_ = s;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp39_ = option;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp40_ = _tmp39_->size;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp41_ = g_strdup_printf (" size=%d", (gint) _tmp40_);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_ = _tmp41_;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = g_strconcat (_tmp38_, _tmp42_, NULL);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (s);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	s = _tmp43_;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp42_);
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp44_ = option;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp45_ = _tmp44_->unit;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	switch (_tmp45_) {
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_UNIT_NONE:
-#line 7007 "scanner.c"
-		{
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7011 "scanner.c"
-		}
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_UNIT_PIXEL:
-#line 7015 "scanner.c"
-		{
-			const gchar* _tmp46_ = NULL;
-			gchar* _tmp47_ = NULL;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp46_ = s;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp47_ = g_strconcat (_tmp46_, " unit=pixels", 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 = _tmp47_;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7029 "scanner.c"
-		}
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_UNIT_BIT:
-#line 7033 "scanner.c"
-		{
-			const gchar* _tmp48_ = NULL;
-			gchar* _tmp49_ = NULL;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp48_ = s;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp49_ = g_strconcat (_tmp48_, " unit=bits", NULL);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp49_;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7047 "scanner.c"
-		}
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_UNIT_MM:
-#line 7051 "scanner.c"
-		{
-			const gchar* _tmp50_ = NULL;
-			gchar* _tmp51_ = NULL;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp50_ = s;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp51_ = g_strconcat (_tmp50_, " unit=mm", NULL);
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp51_;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7065 "scanner.c"
-		}
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_UNIT_DPI:
-#line 7069 "scanner.c"
-		{
-			const gchar* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp52_ = s;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp53_ = g_strconcat (_tmp52_, " unit=dpi", 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 = _tmp53_;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7083 "scanner.c"
-		}
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_UNIT_PERCENT:
-#line 7087 "scanner.c"
-		{
-			const gchar* _tmp54_ = NULL;
-			gchar* _tmp55_ = NULL;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp54_ = s;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp55_ = g_strconcat (_tmp54_, " unit=percent", NULL);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp55_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7101 "scanner.c"
-		}
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_UNIT_MICROSECOND:
-#line 7105 "scanner.c"
-		{
-			const gchar* _tmp56_ = NULL;
-			gchar* _tmp57_ = NULL;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp56_ = s;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp57_ = g_strconcat (_tmp56_, " unit=microseconds", 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 = _tmp57_;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7119 "scanner.c"
-		}
-		default:
-		{
-			const gchar* _tmp58_ = NULL;
-			SANE_Option_Descriptor* _tmp59_ = NULL;
-			SANE_Unit _tmp60_ = 0;
-			gchar* _tmp61_ = NULL;
-			gchar* _tmp62_ = NULL;
-			gchar* _tmp63_ = NULL;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp58_ = s;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp59_ = option;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp60_ = _tmp59_->unit;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp61_ = g_strdup_printf (" unit=%d", (gint) _tmp60_);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp62_ = _tmp61_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp63_ = g_strconcat (_tmp58_, _tmp62_, 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 = _tmp63_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (_tmp62_);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7149 "scanner.c"
-		}
-	}
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp64_ = option;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp65_ = _tmp64_->constraint_type;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	switch (_tmp65_) {
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_CONSTRAINT_RANGE:
-#line 7160 "scanner.c"
-		{
-			SANE_Option_Descriptor* _tmp66_ = NULL;
-			SANE_Value_Type _tmp67_ = 0;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp66_ = option;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp67_ = _tmp66_->type;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp67_ == SANE_TYPE_FIXED) {
-#line 7170 "scanner.c"
-				const gchar* _tmp68_ = NULL;
-				SANE_Option_Descriptor* _tmp69_ = NULL;
-				SANE_Range* _tmp70_ = NULL;
-				SANE_Word _tmp71_ = {0};
-				gdouble _tmp72_ = 0.0;
-				SANE_Option_Descriptor* _tmp73_ = NULL;
-				SANE_Range* _tmp74_ = NULL;
-				SANE_Word _tmp75_ = {0};
-				gdouble _tmp76_ = 0.0;
-				SANE_Option_Descriptor* _tmp77_ = NULL;
-				SANE_Range* _tmp78_ = NULL;
-				SANE_Word _tmp79_ = {0};
-				gchar* _tmp80_ = NULL;
-				gchar* _tmp81_ = NULL;
-				gchar* _tmp82_ = NULL;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp68_ = s;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp69_ = option;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp70_ = _tmp69_->constraint.range;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp71_ = _tmp70_->min;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp72_ = SANE_UNFIX ((SANE_Fixed) _tmp71_);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp73_ = option;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp74_ = _tmp73_->constraint.range;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp75_ = _tmp74_->max;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp76_ = SANE_UNFIX ((SANE_Fixed) _tmp75_);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp77_ = option;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp78_ = _tmp77_->constraint.range;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp79_ = _tmp78_->quant;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp80_ = g_strdup_printf (" min=%f, max=%f, quant=%d", _tmp72_, _tmp76_, (gint) _tmp79_);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp81_ = _tmp80_;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp82_ = g_strconcat (_tmp68_, _tmp81_, NULL);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp82_;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (_tmp81_);
-#line 7222 "scanner.c"
-			} else {
-				const gchar* _tmp83_ = NULL;
-				SANE_Option_Descriptor* _tmp84_ = NULL;
-				SANE_Range* _tmp85_ = NULL;
-				SANE_Word _tmp86_ = {0};
-				SANE_Option_Descriptor* _tmp87_ = NULL;
-				SANE_Range* _tmp88_ = NULL;
-				SANE_Word _tmp89_ = {0};
-				SANE_Option_Descriptor* _tmp90_ = NULL;
-				SANE_Range* _tmp91_ = NULL;
-				SANE_Word _tmp92_ = {0};
-				gchar* _tmp93_ = NULL;
-				gchar* _tmp94_ = NULL;
-				gchar* _tmp95_ = NULL;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp83_ = s;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp84_ = option;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp85_ = _tmp84_->constraint.range;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp86_ = _tmp85_->min;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp87_ = option;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp88_ = _tmp87_->constraint.range;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp89_ = _tmp88_->max;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp90_ = option;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp91_ = _tmp90_->constraint.range;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp92_ = _tmp91_->quant;
-#line 643 "/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 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp94_ = _tmp93_;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp95_ = g_strconcat (_tmp83_, _tmp94_, NULL);
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (s);
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp95_;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (_tmp94_);
-#line 7269 "scanner.c"
-			}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7273 "scanner.c"
-		}
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_CONSTRAINT_WORD_LIST:
-#line 7277 "scanner.c"
-		{
-			const gchar* _tmp96_ = NULL;
-			gchar* _tmp97_ = NULL;
-			const gchar* _tmp126_ = NULL;
-			gchar* _tmp127_ = NULL;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp96_ = s;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp97_ = g_strconcat (_tmp96_, " values=[", NULL);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp97_;
-#line 7291 "scanner.c"
-			{
-				gint i = 0;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				i = 0;
-#line 7296 "scanner.c"
-				{
-					gboolean _tmp98_ = FALSE;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp98_ = TRUE;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					while (TRUE) {
-#line 7303 "scanner.c"
-						gint _tmp100_ = 0;
-						SANE_Option_Descriptor* _tmp101_ = NULL;
-						SANE_Word* _tmp102_ = NULL;
-						gint _tmp102__length1 = 0;
-						SANE_Word _tmp103_ = {0};
-						gint _tmp104_ = 0;
-						SANE_Option_Descriptor* _tmp107_ = NULL;
-						SANE_Value_Type _tmp108_ = 0;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp98_) {
-#line 7314 "scanner.c"
-							gint _tmp99_ = 0;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp99_ = i;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp99_ + 1;
-#line 7320 "scanner.c"
-						}
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp98_ = FALSE;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp100_ = i;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp101_ = option;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp102_ = _tmp101_->constraint.word_list;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp102__length1 = -1;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp103_ = _tmp102_[0];
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp100_) < _tmp103_)) {
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							break;
-#line 7338 "scanner.c"
-						}
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp104_ = i;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp104_ != 0) {
-#line 7344 "scanner.c"
-							const gchar* _tmp105_ = NULL;
-							gchar* _tmp106_ = NULL;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp105_ = s;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp106_ = g_strconcat (_tmp105_, ", ", NULL);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_g_free0 (s);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							s = _tmp106_;
-#line 7355 "scanner.c"
-						}
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp107_ = option;
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp108_ = _tmp107_->type;
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp108_ == SANE_TYPE_INT) {
-#line 7363 "scanner.c"
-							const gchar* _tmp109_ = NULL;
-							SANE_Option_Descriptor* _tmp110_ = NULL;
-							SANE_Word* _tmp111_ = NULL;
-							gint _tmp111__length1 = 0;
-							gint _tmp112_ = 0;
-							SANE_Word _tmp113_ = {0};
-							gchar* _tmp114_ = NULL;
-							gchar* _tmp115_ = NULL;
-							gchar* _tmp116_ = NULL;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp109_ = s;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp110_ = option;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp111_ = _tmp110_->constraint.word_list;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp111__length1 = -1;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp112_ = i;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp113_ = _tmp111_[_tmp112_ + 1];
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp114_ = g_strdup_printf ("%d", (gint) _tmp113_);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp115_ = _tmp114_;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp116_ = g_strconcat (_tmp109_, _tmp115_, NULL);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_g_free0 (s);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							s = _tmp116_;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_g_free0 (_tmp115_);
-#line 7397 "scanner.c"
-						} else {
-							const gchar* _tmp117_ = NULL;
-							SANE_Option_Descriptor* _tmp118_ = NULL;
-							SANE_Word* _tmp119_ = NULL;
-							gint _tmp119__length1 = 0;
-							gint _tmp120_ = 0;
-							SANE_Word _tmp121_ = {0};
-							gdouble _tmp122_ = 0.0;
-							gchar* _tmp123_ = NULL;
-							gchar* _tmp124_ = NULL;
-							gchar* _tmp125_ = NULL;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp117_ = s;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp118_ = option;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp119_ = _tmp118_->constraint.word_list;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp119__length1 = -1;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp120_ = i;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp121_ = _tmp119_[_tmp120_ + 1];
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp122_ = SANE_UNFIX ((SANE_Fixed) _tmp121_);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp123_ = g_strdup_printf ("%f", _tmp122_);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp124_ = _tmp123_;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp125_ = g_strconcat (_tmp117_, _tmp124_, 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 = _tmp125_;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_g_free0 (_tmp124_);
-#line 7435 "scanner.c"
-						}
-					}
-				}
-			}
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp126_ = s;
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp127_ = g_strconcat (_tmp126_, "]", NULL);
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp127_;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7450 "scanner.c"
-		}
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SANE_CONSTRAINT_STRING_LIST:
-#line 7454 "scanner.c"
-		{
-			const gchar* _tmp128_ = NULL;
-			gchar* _tmp129_ = NULL;
-			const gchar* _tmp147_ = NULL;
-			gchar* _tmp148_ = NULL;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp128_ = s;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp129_ = g_strconcat (_tmp128_, " values=[", NULL);
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp129_;
-#line 7468 "scanner.c"
-			{
-				gint i = 0;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				i = 0;
-#line 7473 "scanner.c"
-				{
-					gboolean _tmp130_ = FALSE;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp130_ = TRUE;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					while (TRUE) {
-#line 7480 "scanner.c"
-						SANE_Option_Descriptor* _tmp132_ = NULL;
-						gchar** _tmp133_ = NULL;
-						gint _tmp133__length1 = 0;
-						gint _tmp134_ = 0;
-						const gchar* _tmp135_ = NULL;
-						gint _tmp136_ = 0;
-						const gchar* _tmp139_ = NULL;
-						SANE_Option_Descriptor* _tmp140_ = NULL;
-						gchar** _tmp141_ = NULL;
-						gint _tmp141__length1 = 0;
-						gint _tmp142_ = 0;
-						const gchar* _tmp143_ = NULL;
-						gchar* _tmp144_ = NULL;
-						gchar* _tmp145_ = NULL;
-						gchar* _tmp146_ = NULL;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp130_) {
-#line 7498 "scanner.c"
-							gint _tmp131_ = 0;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp131_ = i;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp131_ + 1;
-#line 7504 "scanner.c"
-						}
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp130_ = FALSE;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp132_ = option;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp133_ = _tmp132_->constraint.string_list;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp133__length1 = _vala_array_length (_tmp132_->constraint.string_list);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp134_ = i;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp135_ = _tmp133_[_tmp134_];
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(_tmp135_ != NULL)) {
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							break;
-#line 7522 "scanner.c"
-						}
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp136_ = i;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp136_ != 0) {
-#line 7528 "scanner.c"
-							const gchar* _tmp137_ = NULL;
-							gchar* _tmp138_ = NULL;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp137_ = s;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp138_ = g_strconcat (_tmp137_, ", ", NULL);
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_g_free0 (s);
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							s = _tmp138_;
-#line 7539 "scanner.c"
-						}
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp139_ = s;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp140_ = option;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp141_ = _tmp140_->constraint.string_list;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp141__length1 = _vala_array_length (_tmp140_->constraint.string_list);
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp142_ = i;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp143_ = _tmp141_[_tmp142_];
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp144_ = g_strdup_printf ("\"%s\"", _tmp143_);
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp145_ = _tmp144_;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp146_ = g_strconcat (_tmp139_, _tmp145_, NULL);
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_g_free0 (s);
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						s = _tmp146_;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_g_free0 (_tmp145_);
-#line 7565 "scanner.c"
-					}
-				}
-			}
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp147_ = s;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp148_ = g_strconcat (_tmp147_, "]", NULL);
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (s);
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp148_;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7579 "scanner.c"
-		}
-		default:
-		{
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 7585 "scanner.c"
-		}
-	}
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp149_ = option;
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp150_ = _tmp149_->cap;
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	cap = _tmp150_;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp151_ = cap;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp151_ != ((SANE_Int) 0)) {
-#line 7598 "scanner.c"
-		gchar* caps = NULL;
-		gchar* _tmp152_ = NULL;
-		SANE_Int _tmp153_ = {0};
-		SANE_Int _tmp160_ = {0};
-		SANE_Int _tmp167_ = {0};
-		SANE_Int _tmp174_ = {0};
-		SANE_Int _tmp181_ = {0};
-		SANE_Int _tmp188_ = {0};
-		SANE_Int _tmp195_ = {0};
-		SANE_Int _tmp202_ = {0};
-		const gchar* _tmp211_ = NULL;
-		const gchar* _tmp212_ = NULL;
-		gchar* _tmp213_ = NULL;
-		gchar* _tmp214_ = NULL;
-		gchar* _tmp215_ = NULL;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp152_ = g_strdup ("");
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		caps = _tmp152_;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp153_ = cap;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp153_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
-#line 7622 "scanner.c"
-			const gchar* _tmp154_ = NULL;
-			const gchar* _tmp157_ = NULL;
-			gchar* _tmp158_ = NULL;
-			SANE_Int _tmp159_ = {0};
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp154_ = caps;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp154_, "") != 0) {
-#line 7631 "scanner.c"
-				const gchar* _tmp155_ = NULL;
-				gchar* _tmp156_ = NULL;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp155_ = caps;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp156_ = g_strconcat (_tmp155_, ",", NULL);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (caps);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				caps = _tmp156_;
-#line 7642 "scanner.c"
-			}
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp157_ = caps;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp158_ = g_strconcat (_tmp157_, "soft-select", NULL);
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (caps);
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			caps = _tmp158_;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp159_ = cap;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp159_ & (~SANE_CAP_SOFT_SELECT);
-#line 7656 "scanner.c"
-		}
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp160_ = cap;
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp160_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
-#line 7662 "scanner.c"
-			const gchar* _tmp161_ = NULL;
-			const gchar* _tmp164_ = NULL;
-			gchar* _tmp165_ = NULL;
-			SANE_Int _tmp166_ = {0};
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp161_ = caps;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp161_, "") != 0) {
-#line 7671 "scanner.c"
-				const gchar* _tmp162_ = NULL;
-				gchar* _tmp163_ = NULL;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp162_ = caps;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp163_ = g_strconcat (_tmp162_, ",", NULL);
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (caps);
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				caps = _tmp163_;
-#line 7682 "scanner.c"
-			}
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp164_ = caps;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp165_ = g_strconcat (_tmp164_, "hard-select", NULL);
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (caps);
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			caps = _tmp165_;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp166_ = cap;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp166_ & (~SANE_CAP_HARD_SELECT);
-#line 7696 "scanner.c"
-		}
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp167_ = cap;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp167_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
-#line 7702 "scanner.c"
-			const gchar* _tmp168_ = NULL;
-			const gchar* _tmp171_ = NULL;
-			gchar* _tmp172_ = NULL;
-			SANE_Int _tmp173_ = {0};
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp168_ = caps;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp168_, "") != 0) {
-#line 7711 "scanner.c"
-				const gchar* _tmp169_ = NULL;
-				gchar* _tmp170_ = NULL;
-#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp169_ = caps;
-#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp170_ = g_strconcat (_tmp169_, ",", NULL);
-#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (caps);
-#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				caps = _tmp170_;
-#line 7722 "scanner.c"
-			}
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp171_ = caps;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp172_ = g_strconcat (_tmp171_, "soft-detect", NULL);
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (caps);
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			caps = _tmp172_;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp173_ = cap;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp173_ & (~SANE_CAP_SOFT_DETECT);
-#line 7736 "scanner.c"
-		}
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp174_ = cap;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp174_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
-#line 7742 "scanner.c"
-			const gchar* _tmp175_ = NULL;
-			const gchar* _tmp178_ = NULL;
-			gchar* _tmp179_ = NULL;
-			SANE_Int _tmp180_ = {0};
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp175_ = caps;
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp175_, "") != 0) {
-#line 7751 "scanner.c"
-				const gchar* _tmp176_ = NULL;
-				gchar* _tmp177_ = NULL;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp176_ = caps;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp177_ = g_strconcat (_tmp176_, ",", NULL);
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (caps);
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				caps = _tmp177_;
-#line 7762 "scanner.c"
-			}
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp178_ = caps;
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp179_ = g_strconcat (_tmp178_, "emulated", NULL);
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (caps);
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			caps = _tmp179_;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp180_ = cap;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp180_ & (~SANE_CAP_EMULATED);
-#line 7776 "scanner.c"
-		}
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp181_ = cap;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp181_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
-#line 7782 "scanner.c"
-			const gchar* _tmp182_ = NULL;
-			const gchar* _tmp185_ = NULL;
-			gchar* _tmp186_ = NULL;
-			SANE_Int _tmp187_ = {0};
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp182_ = caps;
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp182_, "") != 0) {
-#line 7791 "scanner.c"
-				const gchar* _tmp183_ = NULL;
-				gchar* _tmp184_ = NULL;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp183_ = caps;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp184_ = g_strconcat (_tmp183_, ",", NULL);
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (caps);
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				caps = _tmp184_;
-#line 7802 "scanner.c"
-			}
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp185_ = caps;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp186_ = g_strconcat (_tmp185_, "automatic", NULL);
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (caps);
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			caps = _tmp186_;
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp187_ = cap;
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp187_ & (~SANE_CAP_AUTOMATIC);
-#line 7816 "scanner.c"
-		}
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp188_ = cap;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp188_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 7822 "scanner.c"
-			const gchar* _tmp189_ = NULL;
-			const gchar* _tmp192_ = NULL;
-			gchar* _tmp193_ = NULL;
-			SANE_Int _tmp194_ = {0};
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp189_ = caps;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp189_, "") != 0) {
-#line 7831 "scanner.c"
-				const gchar* _tmp190_ = NULL;
-				gchar* _tmp191_ = NULL;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp190_ = caps;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp191_ = g_strconcat (_tmp190_, ",", NULL);
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (caps);
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				caps = _tmp191_;
-#line 7842 "scanner.c"
-			}
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp192_ = caps;
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp193_ = g_strconcat (_tmp192_, "inactive", NULL);
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (caps);
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			caps = _tmp193_;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp194_ = cap;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp194_ & (~SANE_CAP_INACTIVE);
-#line 7856 "scanner.c"
-		}
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp195_ = cap;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp195_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
-#line 7862 "scanner.c"
-			const gchar* _tmp196_ = NULL;
-			const gchar* _tmp199_ = NULL;
-			gchar* _tmp200_ = NULL;
-			SANE_Int _tmp201_ = {0};
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp196_ = caps;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp196_, "") != 0) {
-#line 7871 "scanner.c"
-				const gchar* _tmp197_ = NULL;
-				gchar* _tmp198_ = NULL;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp197_ = caps;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp198_ = g_strconcat (_tmp197_, ",", NULL);
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (caps);
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				caps = _tmp198_;
-#line 7882 "scanner.c"
-			}
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp199_ = caps;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp200_ = g_strconcat (_tmp199_, "advanced", NULL);
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (caps);
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			caps = _tmp200_;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp201_ = cap;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp201_ & (~SANE_CAP_ADVANCED);
-#line 7896 "scanner.c"
-		}
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp202_ = cap;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp202_ != ((SANE_Int) 0)) {
-#line 7902 "scanner.c"
-			const gchar* _tmp203_ = NULL;
-			const gchar* _tmp206_ = NULL;
-			SANE_Int _tmp207_ = {0};
-			gchar* _tmp208_ = NULL;
-			gchar* _tmp209_ = NULL;
-			gchar* _tmp210_ = NULL;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp203_ = caps;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp203_, "") != 0) {
-#line 7913 "scanner.c"
-				const gchar* _tmp204_ = NULL;
-				gchar* _tmp205_ = NULL;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp204_ = caps;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp205_ = g_strconcat (_tmp204_, ",", NULL);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (caps);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				caps = _tmp205_;
-#line 7924 "scanner.c"
-			}
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp206_ = caps;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp207_ = cap;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp208_ = g_strdup_printf ("%x", (guint) ((gint) _tmp207_));
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp209_ = _tmp208_;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp210_ = g_strconcat (_tmp206_, _tmp209_, NULL);
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (caps);
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			caps = _tmp210_;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (_tmp209_);
-#line 7942 "scanner.c"
-		}
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp211_ = s;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp212_ = caps;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp213_ = g_strconcat (" cap=", _tmp212_, NULL);
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp214_ = _tmp213_;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp215_ = g_strconcat (_tmp211_, _tmp214_, NULL);
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (s);
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		s = _tmp215_;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (_tmp214_);
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (caps);
-#line 7962 "scanner.c"
-	}
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp216_ = s;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:735: %s", _tmp216_);
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp217_ = option;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp218_ = _tmp217_->desc;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp218_ != NULL) {
-#line 7974 "scanner.c"
-		SANE_Option_Descriptor* _tmp219_ = NULL;
-		const gchar* _tmp220_ = NULL;
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp219_ = option;
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp220_ = _tmp219_->desc;
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:738:   Description: %s", _tmp220_);
-#line 7983 "scanner.c"
-	}
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (s);
-#line 7987 "scanner.c"
-}
-
-
-static void scanner_authorization_cb (const gchar* resource, gchar* username, int username_length1, gchar* password, int password_length1) {
-	Scanner* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	NotifyRequestAuthorization* _tmp2_ = NULL;
-	NotifyRequestAuthorization* _tmp3_ = NULL;
-	Credentials* credentials = NULL;
-	Scanner* _tmp4_ = NULL;
-	GAsyncQueue* _tmp5_ = NULL;
-	gpointer _tmp6_ = NULL;
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (resource != NULL);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = scanner_scanner_object;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = resource;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = notify_request_authorization_new (_tmp1_);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = _tmp2_;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_notify (_tmp0_, (Notify*) _tmp3_);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_notify_unref0 (_tmp3_);
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = scanner_scanner_object;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = _tmp4_->priv->authorize_queue;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = g_async_queue_pop (_tmp5_);
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	credentials = (Credentials*) _tmp6_;
-#line 8022 "scanner.c"
-	{
-		gint i = 0;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		i = 0;
-#line 8027 "scanner.c"
-		{
-			gboolean _tmp7_ = FALSE;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp7_ = TRUE;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			while (TRUE) {
-#line 8034 "scanner.c"
-				gboolean _tmp9_ = FALSE;
-				Credentials* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				gchar _tmp13_ = '\0';
-				gchar* _tmp16_ = NULL;
-				gint _tmp16__length1 = 0;
-				gint _tmp17_ = 0;
-				Credentials* _tmp18_ = NULL;
-				const gchar* _tmp19_ = NULL;
-				gint _tmp20_ = 0;
-				gchar _tmp21_ = '\0';
-				gchar _tmp22_ = '\0';
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp7_) {
-#line 8050 "scanner.c"
-					gint _tmp8_ = 0;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp8_ = i;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					i = _tmp8_ + 1;
-#line 8056 "scanner.c"
-				}
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp7_ = FALSE;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp10_ = credentials;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp11_ = _tmp10_->username;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp12_ = i;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp13_ = string_get (_tmp11_, (glong) _tmp12_);
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp13_ != '\0') {
-#line 8070 "scanner.c"
-					gint _tmp14_ = 0;
-					gint _tmp15_ = 0;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp14_ = i;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp15_ = SANE_MAX_USERNAME_LEN;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp9_ = _tmp14_ < _tmp15_;
-#line 8079 "scanner.c"
-				} else {
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp9_ = FALSE;
-#line 8083 "scanner.c"
-				}
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp9_) {
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 8089 "scanner.c"
-				}
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp16_ = username;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp16__length1 = username_length1;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp17_ = i;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp18_ = credentials;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp19_ = _tmp18_->username;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp20_ = i;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp21_ = string_get (_tmp19_, (glong) _tmp20_);
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp16_[_tmp17_] = _tmp21_;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp22_ = _tmp16_[_tmp17_];
-#line 8109 "scanner.c"
-			}
-		}
-	}
-	{
-		gint i = 0;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		i = 0;
-#line 8117 "scanner.c"
-		{
-			gboolean _tmp23_ = FALSE;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp23_ = TRUE;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			while (TRUE) {
-#line 8124 "scanner.c"
-				gboolean _tmp25_ = FALSE;
-				Credentials* _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
-				gint _tmp28_ = 0;
-				gchar _tmp29_ = '\0';
-				gchar* _tmp32_ = NULL;
-				gint _tmp32__length1 = 0;
-				gint _tmp33_ = 0;
-				Credentials* _tmp34_ = NULL;
-				const gchar* _tmp35_ = NULL;
-				gint _tmp36_ = 0;
-				gchar _tmp37_ = '\0';
-				gchar _tmp38_ = '\0';
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp23_) {
-#line 8140 "scanner.c"
-					gint _tmp24_ = 0;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp24_ = i;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					i = _tmp24_ + 1;
-#line 8146 "scanner.c"
-				}
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp23_ = FALSE;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp26_ = credentials;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp27_ = _tmp26_->password;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp28_ = i;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp29_ != '\0') {
-#line 8160 "scanner.c"
-					gint _tmp30_ = 0;
-					gint _tmp31_ = 0;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp30_ = i;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp31_ = SANE_MAX_USERNAME_LEN;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp25_ = _tmp30_ < _tmp31_;
-#line 8169 "scanner.c"
-				} else {
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp25_ = FALSE;
-#line 8173 "scanner.c"
-				}
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp25_) {
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 8179 "scanner.c"
-				}
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp32_ = password;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp32__length1 = password_length1;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp33_ = i;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp34_ = credentials;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp35_ = _tmp34_->password;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp36_ = i;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp37_ = string_get (_tmp35_, (glong) _tmp36_);
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp32_[_tmp33_] = _tmp37_;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp38_ = _tmp32_[_tmp33_];
-#line 8199 "scanner.c"
-			}
-		}
-	}
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_credentials_unref0 (credentials);
-#line 8205 "scanner.c"
-}
-
-
-static gpointer _credentials_ref0 (gpointer self) {
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return self ? credentials_ref (self) : NULL;
-#line 8212 "scanner.c"
-}
-
-
-void scanner_authorize (Scanner* self, const gchar* username, const gchar* password) {
-	Credentials* credentials = NULL;
-	Credentials* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GAsyncQueue* _tmp5_ = NULL;
-	Credentials* _tmp6_ = NULL;
-#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 (username != NULL);
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (password != NULL);
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = credentials_new ();
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	credentials = _tmp0_;
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = username;
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (credentials->username);
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	credentials->username = _tmp2_;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = password;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = g_strdup (_tmp3_);
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (credentials->password);
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	credentials->password = _tmp4_;
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = self->priv->authorize_queue;
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = _credentials_ref0 (credentials);
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_async_queue_push (_tmp5_, _tmp6_);
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_credentials_unref0 (credentials);
-#line 8259 "scanner.c"
-}
-
-
-static void scanner_close_device (Scanner* self) {
-	gboolean _tmp0_ = FALSE;
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->have_handle;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp0_) {
-#line 8271 "scanner.c"
-		SANE_Handle _tmp1_ = {0};
-		SANE_Handle _tmp2_ = {0};
-#line 764 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp1_ = self->priv->handle;
-#line 764 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		sane_cancel (_tmp1_);
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:765: sane_cancel ()");
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp2_ = self->priv->handle;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		sane_close (_tmp2_);
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:768: sane_close ()");
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->have_handle = FALSE;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_hash_table_unref0 (self->priv->options);
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->options = NULL;
-#line 8292 "scanner.c"
-	}
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->buffer = NULL;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->buffer_length1 = 0;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->job_queue = NULL;
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_set_scanning (self, FALSE);
-#line 8308 "scanner.c"
-}
-
-
-static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* error_string) {
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	NotifyScanFailed* _tmp2_ = NULL;
-	NotifyScanFailed* _tmp3_ = NULL;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (error_string != NULL);
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_close_device (self);
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->state = SCAN_STATE_IDLE;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = error_code;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = error_string;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = notify_scan_failed_new (_tmp0_, _tmp1_);
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = _tmp2_;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_notify (self, (Notify*) _tmp3_);
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_notify_unref0 (_tmp3_);
-#line 8337 "scanner.c"
-}
-
-
-static gpointer _request_ref0 (gpointer self) {
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return self ? request_ref (self) : NULL;
-#line 8344 "scanner.c"
-}
-
-
-static gpointer _scan_job_ref0 (gpointer self) {
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return self ? scan_job_ref (self) : NULL;
-#line 8351 "scanner.c"
-}
-
-
-static gboolean scanner_handle_requests (Scanner* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	ScanState _tmp1_ = 0;
-	gint request_count = 0;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = self->priv->state;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp1_ == SCAN_STATE_IDLE) {
-#line 8366 "scanner.c"
-		gboolean _tmp2_ = FALSE;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp2_ = self->priv->need_redetect;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = _tmp2_;
-#line 8372 "scanner.c"
-	} else {
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = FALSE;
-#line 8376 "scanner.c"
-	}
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp0_) {
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_REDETECT;
-#line 8382 "scanner.c"
-	}
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	request_count = 0;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	while (TRUE) {
-#line 8388 "scanner.c"
-		Request* request = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
-		ScanState _tmp5_ = 0;
-		gint _tmp11_ = 0;
-		Request* _tmp12_ = NULL;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp5_ = self->priv->state;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp5_ == SCAN_STATE_IDLE) {
-#line 8399 "scanner.c"
-			gint _tmp6_ = 0;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp6_ = request_count;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp4_ = _tmp6_ == 0;
-#line 8405 "scanner.c"
-		} else {
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp4_ = FALSE;
-#line 8409 "scanner.c"
-		}
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp4_) {
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp3_ = TRUE;
-#line 8415 "scanner.c"
-		} else {
-			GAsyncQueue* _tmp7_ = NULL;
-			gint _tmp8_ = 0;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp7_ = self->priv->request_queue;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp8_ = g_async_queue_length (_tmp7_);
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp3_ = _tmp8_ > 0;
-#line 8425 "scanner.c"
-		}
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp3_) {
-#line 8429 "scanner.c"
-			GAsyncQueue* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp9_ = self->priv->request_queue;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp10_ = g_async_queue_pop (_tmp9_);
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_request_unref0 (request);
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			request = (Request*) _tmp10_;
-#line 8440 "scanner.c"
-		} else {
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = TRUE;
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_request_unref0 (request);
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 8448 "scanner.c"
-		}
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:803: Processing request");
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp11_ = request_count;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		request_count = _tmp11_ + 1;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp12_ = request;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_REQUEST_START_SCAN)) {
-#line 8460 "scanner.c"
-			RequestStartScan* r = NULL;
-			Request* _tmp13_ = NULL;
-			RequestStartScan* _tmp14_ = NULL;
-			RequestStartScan* _tmp15_ = NULL;
-			ScanJob* _tmp16_ = NULL;
-			ScanJob* _tmp17_ = NULL;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp13_ = request;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp14_ = _request_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_REQUEST_START_SCAN, RequestStartScan));
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			r = _tmp14_;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp15_ = r;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp16_ = _tmp15_->job;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp17_ = _scan_job_ref0 (_tmp16_);
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp17_);
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_request_unref0 (r);
-#line 8483 "scanner.c"
-		} else {
-			Request* _tmp18_ = NULL;
-#line 811 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp18_ = request;
-#line 811 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_REQUEST_CANCEL)) {
-#line 813 "/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 8492 "scanner.c"
-			} else {
-				Request* _tmp19_ = NULL;
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp19_ = request;
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_REQUEST_QUIT)) {
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_close_device (self);
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					result = FALSE;
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_request_unref0 (request);
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					return result;
-#line 8507 "scanner.c"
-				}
-			}
-		}
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_request_unref0 (request);
-#line 8513 "scanner.c"
-	}
-}
-
-
-static void _g_free0_ (gpointer var) {
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	var = (g_free (var), NULL);
-#line 8521 "scanner.c"
-}
-
-
-static void scanner_do_open (Scanner* self) {
-	ScanJob* job = NULL;
-	GList* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	ScanJob* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	ScanJob* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	ScanJob* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	GHashFunc _tmp18_ = NULL;
-	GEqualFunc _tmp19_ = NULL;
-	GHashTable* _tmp20_ = NULL;
-	SANE_Status status = 0;
-	ScanJob* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	SANE_Handle _tmp23_ = {0};
-	SANE_Status _tmp24_ = 0;
-	ScanJob* _tmp25_ = NULL;
-	const gchar* _tmp26_ = NULL;
-	SANE_Status _tmp27_ = 0;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	SANE_Status _tmp30_ = 0;
-	ScanJob* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->job_queue;
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = _tmp0_->data;
-#line 825 "/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 825 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	job = _tmp2_;
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->line_count = 0;
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->pass_number = 0;
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->page_number = 0;
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->notified_page = -1;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->option_index = (SANE_Int) 0;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = job;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = _tmp4_->device;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp5_ == NULL) {
-#line 8579 "scanner.c"
-		const gchar* _tmp6_ = NULL;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp6_ = self->priv->default_device;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp3_ = _tmp6_ != NULL;
-#line 8585 "scanner.c"
-	} else {
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp3_ = FALSE;
-#line 8589 "scanner.c"
-	}
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp3_) {
-#line 8593 "scanner.c"
-		ScanJob* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = job;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = self->priv->default_device;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp9_ = g_strdup (_tmp8_);
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (_tmp7_->device);
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_->device = _tmp9_;
-#line 8607 "scanner.c"
-	}
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp10_ = job;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp11_ = _tmp10_->device;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp11_ == NULL) {
-#line 8615 "scanner.c"
-		const gchar* _tmp12_ = NULL;
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:838: No scan device available");
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp12_ = _ ("No scanners available.  Please connect a scanner.");
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_fail_scan (self, 0, _tmp12_);
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 8627 "scanner.c"
-	}
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp13_ = self->priv->have_handle;
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp13_) {
-#line 8633 "scanner.c"
-		const gchar* _tmp14_ = NULL;
-		ScanJob* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		SANE_Handle _tmp17_ = {0};
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = self->priv->current_device;
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp15_ = job;
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp16_ = _tmp15_->device;
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (g_strcmp0 (_tmp14_, _tmp16_) == 0) {
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			self->priv->state = SCAN_STATE_GET_OPTION;
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_scan_job_unref0 (job);
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return;
-#line 8652 "scanner.c"
-		}
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp17_ = self->priv->handle;
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		sane_close (_tmp17_);
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:855: sane_close ()");
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->have_handle = FALSE;
-#line 8662 "scanner.c"
-	}
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (self->priv->current_device);
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->current_device = NULL;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->have_handle = FALSE;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp18_ = g_str_hash;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp19_ = g_str_equal;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp20_ = g_hash_table_new_full (_tmp18_, _tmp19_, _g_free0_, NULL);
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_hash_table_unref0 (self->priv->options);
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->options = _tmp20_;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp21_ = job;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp22_ = _tmp21_->device;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp24_ = sane_open (_tmp22_, &_tmp23_);
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->handle = _tmp23_;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp24_;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_ = job;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26_ = _tmp25_->device;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_ = status;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28_ = sane_status_to_string (_tmp27_);
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp29_ = _tmp28_;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:864: sane_open (\"%s\") -> %s", _tmp26_, _tmp29_);
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp29_);
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_ = status;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp30_ != SANE_STATUS_GOOD) {
-#line 8708 "scanner.c"
-		SANE_Status _tmp31_ = 0;
-		const gchar* _tmp32_ = NULL;
-		SANE_Status _tmp33_ = 0;
-		const gchar* _tmp34_ = NULL;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp31_ = status;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp32_ = sane_strstatus (_tmp31_);
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:868: Unable to get open device: %s", _tmp32_);
-#line 869 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp33_ = status;
-#line 869 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp34_ = _ ("Unable to connect to scanner");
-#line 869 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_fail_scan (self, (gint) _tmp33_, _tmp34_);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 8729 "scanner.c"
-	}
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->have_handle = TRUE;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp35_ = job;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_ = _tmp35_->device;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp37_ = g_strdup (_tmp36_);
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (self->priv->current_device);
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->current_device = _tmp37_;
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->state = SCAN_STATE_GET_OPTION;
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_scan_job_unref0 (job);
-#line 8747 "scanner.c"
-}
-
-
-static void scanner_do_get_option (Scanner* self) {
-	ScanJob* job = NULL;
-	GList* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	ScanJob* _tmp2_ = NULL;
-	SANE_Option_Descriptor* option = NULL;
-	SANE_Handle _tmp3_ = {0};
-	SANE_Int _tmp4_ = {0};
-	SANE_Option_Descriptor* _tmp5_ = NULL;
-	SANE_Int _tmp6_ = {0};
-	SANE_Int index = {0};
-	SANE_Int _tmp7_ = {0};
-	SANE_Int _tmp8_ = {0};
-	SANE_Option_Descriptor* _tmp9_ = NULL;
-	SANE_Int _tmp356_ = {0};
-	SANE_Option_Descriptor* _tmp357_ = NULL;
-	SANE_Option_Descriptor* _tmp358_ = NULL;
-	SANE_Value_Type _tmp359_ = 0;
-	SANE_Option_Descriptor* _tmp360_ = NULL;
-	SANE_Int _tmp361_ = {0};
-	SANE_Option_Descriptor* _tmp362_ = NULL;
-	const gchar* _tmp363_ = NULL;
-	GHashTable* _tmp364_ = NULL;
-	SANE_Option_Descriptor* _tmp365_ = NULL;
-	const gchar* _tmp366_ = NULL;
-	gchar* _tmp367_ = NULL;
-	SANE_Int _tmp368_ = {0};
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->job_queue;
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = _tmp0_->data;
-#line 882 "/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 882 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	job = _tmp2_;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = self->priv->handle;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = self->priv->option_index;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = sane_get_option_descriptor (_tmp3_, _tmp4_);
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	option = _tmp5_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = self->priv->option_index;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:885: sane_get_option_descriptor (%d)", (gint) _tmp6_);
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = self->priv->option_index;
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	index = _tmp7_;
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp8_ = self->priv->option_index;
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->option_index = _tmp8_ + 1;
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp9_ = option;
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp9_ == NULL) {
-#line 8812 "scanner.c"
-		SANE_Handle _tmp10_ = {0};
-		const gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		SANE_Option_Descriptor* _tmp13_ = NULL;
-		SANE_Option_Descriptor* _tmp14_ = NULL;
-		SANE_Option_Descriptor* _tmp18_ = NULL;
-		SANE_Handle _tmp96_ = {0};
-		const gchar* _tmp97_ = NULL;
-		gint _tmp98_ = 0;
-		SANE_Option_Descriptor* _tmp99_ = NULL;
-		SANE_Option_Descriptor* _tmp100_ = NULL;
-		SANE_Handle _tmp156_ = {0};
-		gint _tmp157_ = 0;
-		SANE_Option_Descriptor* _tmp158_ = NULL;
-		SANE_Option_Descriptor* _tmp159_ = NULL;
-		SANE_Handle _tmp167_ = {0};
-		gint _tmp168_ = 0;
-		SANE_Option_Descriptor* _tmp169_ = NULL;
-		SANE_Option_Descriptor* _tmp170_ = NULL;
-		SANE_Handle _tmp178_ = {0};
-		gint _tmp179_ = 0;
-		SANE_Option_Descriptor* _tmp180_ = NULL;
-		SANE_Option_Descriptor* _tmp181_ = NULL;
-		SANE_Handle _tmp194_ = {0};
-		const gchar* _tmp195_ = NULL;
-		gint _tmp196_ = 0;
-		SANE_Option_Descriptor* _tmp197_ = NULL;
-		SANE_Option_Descriptor* _tmp198_ = NULL;
-		SANE_Handle _tmp218_ = {0};
-		const gchar* _tmp219_ = NULL;
-		gint _tmp220_ = 0;
-		SANE_Option_Descriptor* _tmp221_ = NULL;
-		SANE_Option_Descriptor* _tmp222_ = NULL;
-		SANE_Handle _tmp237_ = {0};
-		const gchar* _tmp238_ = NULL;
-		gint _tmp239_ = 0;
-		SANE_Option_Descriptor* _tmp240_ = NULL;
-		SANE_Option_Descriptor* _tmp241_ = NULL;
-		SANE_Handle _tmp256_ = {0};
-		const gchar* _tmp257_ = NULL;
-		gint _tmp258_ = 0;
-		SANE_Option_Descriptor* _tmp259_ = NULL;
-		gboolean _tmp260_ = FALSE;
-		SANE_Option_Descriptor* _tmp261_ = NULL;
-		SANE_Handle _tmp273_ = {0};
-		const gchar* _tmp274_ = NULL;
-		gint _tmp275_ = 0;
-		SANE_Option_Descriptor* _tmp276_ = NULL;
-		gboolean _tmp277_ = FALSE;
-		SANE_Option_Descriptor* _tmp278_ = NULL;
-		SANE_Handle _tmp290_ = {0};
-		const gchar* _tmp291_ = NULL;
-		gint _tmp292_ = 0;
-		SANE_Option_Descriptor* _tmp293_ = NULL;
-		SANE_Option_Descriptor* _tmp294_ = NULL;
-		SANE_Handle _tmp305_ = {0};
-		const gchar* _tmp306_ = NULL;
-		gint _tmp307_ = 0;
-		SANE_Option_Descriptor* _tmp308_ = NULL;
-		SANE_Option_Descriptor* _tmp309_ = NULL;
-		const gchar* _tmp320_ = NULL;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp10_ = self->priv->handle;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp11_ = SANE_NAME_SCAN_SOURCE;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp13_ = scanner_get_option_by_name (self, _tmp10_, _tmp11_, &_tmp12_);
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp12_;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp13_;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = option;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp14_ == NULL) {
-#line 8888 "scanner.c"
-			SANE_Handle _tmp15_ = {0};
-			gint _tmp16_ = 0;
-			SANE_Option_Descriptor* _tmp17_ = NULL;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_debug ("scanner.vala:896: SCAN_SOURCE not available, trying alternative \"doc-" \
-"source\"");
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp15_ = self->priv->handle;
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp17_ = scanner_get_option_by_name (self, _tmp15_, "doc-source", &_tmp16_);
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp16_;
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp17_;
-#line 8902 "scanner.c"
-		}
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp18_ = option;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp18_ != NULL) {
-#line 8908 "scanner.c"
-			gchar** flatbed_sources = NULL;
-			gchar* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
-			const gchar* _tmp23_ = NULL;
-			gchar* _tmp24_ = NULL;
-			gchar* _tmp25_ = NULL;
-			gchar* _tmp26_ = NULL;
-			const gchar* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			gchar** _tmp29_ = NULL;
-			gint flatbed_sources_length1 = 0;
-			gint _flatbed_sources_size_ = 0;
-			gchar** adf_sources = NULL;
-			gchar* _tmp30_ = NULL;
-			const gchar* _tmp31_ = NULL;
-			gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
-			gchar* _tmp35_ = NULL;
-			gchar* _tmp36_ = NULL;
-			gchar** _tmp37_ = NULL;
-			gint adf_sources_length1 = 0;
-			gint _adf_sources_size_ = 0;
-			gchar** adf_front_sources = NULL;
-			gchar* _tmp38_ = NULL;
-			const gchar* _tmp39_ = NULL;
-			gchar* _tmp40_ = NULL;
-			gchar** _tmp41_ = NULL;
-			gint adf_front_sources_length1 = 0;
-			gint _adf_front_sources_size_ = 0;
-			gchar** adf_back_sources = NULL;
-			gchar* _tmp42_ = NULL;
-			const gchar* _tmp43_ = NULL;
-			gchar* _tmp44_ = NULL;
-			gchar** _tmp45_ = NULL;
-			gint adf_back_sources_length1 = 0;
-			gint _adf_back_sources_size_ = 0;
-			gchar** adf_duplex_sources = NULL;
-			gchar* _tmp46_ = NULL;
-			const gchar* _tmp47_ = NULL;
-			gchar* _tmp48_ = NULL;
-			gchar* _tmp49_ = NULL;
-			gchar* _tmp50_ = NULL;
-			gchar* _tmp51_ = NULL;
-			gchar* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
-			gchar** _tmp54_ = NULL;
-			gint adf_duplex_sources_length1 = 0;
-			gint _adf_duplex_sources_size_ = 0;
-			ScanJob* _tmp55_ = NULL;
-			ScanType _tmp56_ = 0;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp19_ = g_strdup ("Auto");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp20_ = SANE_I18N ("Auto");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp21_ = g_strdup (_tmp20_);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp22_ = g_strdup ("Flatbed");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp23_ = SANE_I18N ("Flatbed");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp24_ = g_strdup (_tmp23_);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp25_ = g_strdup ("FlatBed");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp26_ = g_strdup ("Normal");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp27_ = SANE_I18N ("Normal");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp28_ = g_strdup (_tmp27_);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_ = g_new0 (gchar*, 7 + 1);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_[0] = _tmp19_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_[1] = _tmp21_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_[2] = _tmp22_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_[3] = _tmp24_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_[4] = _tmp25_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_[5] = _tmp26_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_[6] = _tmp28_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			flatbed_sources = _tmp29_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			flatbed_sources_length1 = 7;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_flatbed_sources_size_ = flatbed_sources_length1;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp30_ = g_strdup ("Automatic Document Feeder");
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp31_ = SANE_I18N ("Automatic Document Feeder");
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp32_ = g_strdup (_tmp31_);
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp33_ = g_strdup ("ADF");
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp34_ = g_strdup ("Automatic Document Feeder(left aligned)");
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp35_ = g_strdup ("Automatic Document Feeder(centrally aligned)");
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp36_ = g_strdup ("ADF Simplex");
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp37_ = g_new0 (gchar*, 6 + 1);
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp37_[0] = _tmp30_;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp37_[1] = _tmp32_;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp37_[2] = _tmp33_;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp37_[3] = _tmp34_;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp37_[4] = _tmp35_;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp37_[5] = _tmp36_;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			adf_sources = _tmp37_;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			adf_sources_length1 = 6;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_adf_sources_size_ = adf_sources_length1;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp38_ = g_strdup ("ADF Front");
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp39_ = SANE_I18N ("ADF Front");
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp40_ = g_strdup (_tmp39_);
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp41_ = g_new0 (gchar*, 2 + 1);
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp41_[0] = _tmp38_;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp41_[1] = _tmp40_;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			adf_front_sources = _tmp41_;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			adf_front_sources_length1 = 2;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_adf_front_sources_size_ = adf_front_sources_length1;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp42_ = g_strdup ("ADF Back");
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp43_ = SANE_I18N ("ADF Back");
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp44_ = g_strdup (_tmp43_);
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp45_ = g_new0 (gchar*, 2 + 1);
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp45_[0] = _tmp42_;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp45_[1] = _tmp44_;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			adf_back_sources = _tmp45_;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			adf_back_sources_length1 = 2;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_adf_back_sources_size_ = adf_back_sources_length1;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp46_ = g_strdup ("ADF Duplex");
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp47_ = SANE_I18N ("ADF Duplex");
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp48_ = g_strdup (_tmp47_);
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp49_ = g_strdup ("ADF Duplex - Long-Edge Binding");
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp50_ = g_strdup ("ADF Duplex - Short-Edge Binding");
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp51_ = g_strdup ("Duplex");
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp52_ = g_strdup ("Automatic Document Feeder(centrally aligned,Duplex)");
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp53_ = g_strdup ("Automatic Document Feeder(left aligned,Duplex)");
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp54_ = g_new0 (gchar*, 7 + 1);
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp54_[0] = _tmp46_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp54_[1] = _tmp48_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp54_[2] = _tmp49_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp54_[3] = _tmp50_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp54_[4] = _tmp51_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp54_[5] = _tmp52_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp54_[6] = _tmp53_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			adf_duplex_sources = _tmp54_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			adf_duplex_sources_length1 = 7;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_adf_duplex_sources_size_ = adf_duplex_sources_length1;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp55_ = job;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp56_ = _tmp55_->type;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			switch (_tmp56_) {
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				case SCAN_TYPE_SINGLE:
-#line 9120 "scanner.c"
-				{
-					SANE_Handle _tmp57_ = {0};
-					SANE_Option_Descriptor* _tmp58_ = NULL;
-					SANE_Int _tmp59_ = {0};
-					gboolean _tmp60_ = FALSE;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp57_ = self->priv->handle;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp58_ = option;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp59_ = index;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp60_ = scanner_set_default_option (self, _tmp57_, _tmp58_, _tmp59_);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp60_) {
-#line 9136 "scanner.c"
-						SANE_Handle _tmp61_ = {0};
-						SANE_Option_Descriptor* _tmp62_ = NULL;
-						SANE_Int _tmp63_ = {0};
-						gchar** _tmp64_ = NULL;
-						gint _tmp64__length1 = 0;
-						gboolean _tmp65_ = FALSE;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp61_ = self->priv->handle;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp62_ = option;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp63_ = index;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp64_ = flatbed_sources;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp64__length1 = flatbed_sources_length1;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp65_ = scanner_set_constrained_string_option (self, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp64__length1, NULL);
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp65_) {
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:950: Unable to set single page source, please file a bug");
-#line 9159 "scanner.c"
-						}
-					}
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 9164 "scanner.c"
-				}
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				case SCAN_TYPE_ADF_FRONT:
-#line 9168 "scanner.c"
-				{
-					SANE_Handle _tmp66_ = {0};
-					SANE_Option_Descriptor* _tmp67_ = NULL;
-					SANE_Int _tmp68_ = {0};
-					gchar** _tmp69_ = NULL;
-					gint _tmp69__length1 = 0;
-					gboolean _tmp70_ = FALSE;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp66_ = self->priv->handle;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp67_ = option;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp68_ = index;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp69_ = adf_front_sources;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp69__length1 = adf_front_sources_length1;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp70_ = scanner_set_constrained_string_option (self, _tmp66_, _tmp67_, _tmp68_, _tmp69_, _tmp69__length1, NULL);
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp70_) {
-#line 9190 "scanner.c"
-						SANE_Handle _tmp71_ = {0};
-						SANE_Option_Descriptor* _tmp72_ = NULL;
-						SANE_Int _tmp73_ = {0};
-						gchar** _tmp74_ = NULL;
-						gint _tmp74__length1 = 0;
-						gboolean _tmp75_ = FALSE;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp71_ = self->priv->handle;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp72_ = option;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp73_ = index;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp74_ = adf_sources;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp74__length1 = adf_sources_length1;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp75_ = scanner_set_constrained_string_option (self, _tmp71_, _tmp72_, _tmp73_, _tmp74_, _tmp74__length1, NULL);
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp75_) {
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:955: Unable to set front ADF source, please file a bug");
-#line 9213 "scanner.c"
-						}
-					}
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 9218 "scanner.c"
-				}
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				case SCAN_TYPE_ADF_BACK:
-#line 9222 "scanner.c"
-				{
-					SANE_Handle _tmp76_ = {0};
-					SANE_Option_Descriptor* _tmp77_ = NULL;
-					SANE_Int _tmp78_ = {0};
-					gchar** _tmp79_ = NULL;
-					gint _tmp79__length1 = 0;
-					gboolean _tmp80_ = FALSE;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp76_ = self->priv->handle;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp77_ = option;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp78_ = index;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp79_ = adf_back_sources;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp79__length1 = adf_back_sources_length1;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp80_ = scanner_set_constrained_string_option (self, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp79__length1, NULL);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp80_) {
-#line 9244 "scanner.c"
-						SANE_Handle _tmp81_ = {0};
-						SANE_Option_Descriptor* _tmp82_ = NULL;
-						SANE_Int _tmp83_ = {0};
-						gchar** _tmp84_ = NULL;
-						gint _tmp84__length1 = 0;
-						gboolean _tmp85_ = FALSE;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp81_ = self->priv->handle;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp82_ = option;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp83_ = index;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp84_ = adf_sources;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp84__length1 = adf_sources_length1;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp85_ = scanner_set_constrained_string_option (self, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp84__length1, NULL);
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp85_) {
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:960: Unable to set back ADF source, please file a bug");
-#line 9267 "scanner.c"
-						}
-					}
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 9272 "scanner.c"
-				}
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				case SCAN_TYPE_ADF_BOTH:
-#line 9276 "scanner.c"
-				{
-					SANE_Handle _tmp86_ = {0};
-					SANE_Option_Descriptor* _tmp87_ = NULL;
-					SANE_Int _tmp88_ = {0};
-					gchar** _tmp89_ = NULL;
-					gint _tmp89__length1 = 0;
-					gboolean _tmp90_ = FALSE;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp86_ = self->priv->handle;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp87_ = option;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp88_ = index;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp89_ = adf_duplex_sources;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp89__length1 = adf_duplex_sources_length1;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp90_ = scanner_set_constrained_string_option (self, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp89__length1, NULL);
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp90_) {
-#line 9298 "scanner.c"
-						SANE_Handle _tmp91_ = {0};
-						SANE_Option_Descriptor* _tmp92_ = NULL;
-						SANE_Int _tmp93_ = {0};
-						gchar** _tmp94_ = NULL;
-						gint _tmp94__length1 = 0;
-						gboolean _tmp95_ = FALSE;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp91_ = self->priv->handle;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp92_ = option;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp93_ = index;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp94_ = adf_sources;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp94__length1 = adf_sources_length1;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp95_ = scanner_set_constrained_string_option (self, _tmp91_, _tmp92_, _tmp93_, _tmp94_, _tmp94__length1, NULL);
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp95_) {
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:965: Unable to set duplex ADF source, please file a bug");
-#line 9321 "scanner.c"
-						}
-					}
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 9326 "scanner.c"
-				}
-				default:
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 9331 "scanner.c"
-			}
-#line 899 "/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 899 "/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 899 "/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 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 9343 "scanner.c"
-		}
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp96_ = self->priv->handle;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp97_ = SANE_NAME_SCAN_MODE;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp99_ = scanner_get_option_by_name (self, _tmp96_, _tmp97_, &_tmp98_);
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp98_;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp99_;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp100_ = option;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp100_ != NULL) {
-#line 9359 "scanner.c"
-			gchar** color_scan_modes = NULL;
-			const gchar* _tmp101_ = NULL;
-			gchar* _tmp102_ = NULL;
-			gchar* _tmp103_ = NULL;
-			gchar* _tmp104_ = NULL;
-			gchar* _tmp105_ = NULL;
-			gchar** _tmp106_ = NULL;
-			gint color_scan_modes_length1 = 0;
-			gint _color_scan_modes_size_ = 0;
-			gchar** gray_scan_modes = NULL;
-			const gchar* _tmp107_ = NULL;
-			gchar* _tmp108_ = NULL;
-			gchar* _tmp109_ = NULL;
-			gchar* _tmp110_ = NULL;
-			const gchar* _tmp111_ = NULL;
-			gchar* _tmp112_ = NULL;
-			gchar* _tmp113_ = NULL;
-			gchar* _tmp114_ = NULL;
-			gchar** _tmp115_ = NULL;
-			gint gray_scan_modes_length1 = 0;
-			gint _gray_scan_modes_size_ = 0;
-			gchar** lineart_scan_modes = NULL;
-			const gchar* _tmp116_ = NULL;
-			gchar* _tmp117_ = NULL;
-			gchar* _tmp118_ = NULL;
-			gchar* _tmp119_ = NULL;
-			const gchar* _tmp120_ = NULL;
-			gchar* _tmp121_ = NULL;
-			gchar* _tmp122_ = NULL;
-			const gchar* _tmp123_ = NULL;
-			gchar* _tmp124_ = NULL;
-			gchar* _tmp125_ = NULL;
-			const gchar* _tmp126_ = NULL;
-			gchar* _tmp127_ = NULL;
-			gchar* _tmp128_ = NULL;
-			const gchar* _tmp129_ = NULL;
-			gchar* _tmp130_ = NULL;
-			gchar* _tmp131_ = NULL;
-			gchar* _tmp132_ = NULL;
-			const gchar* _tmp133_ = NULL;
-			gchar* _tmp134_ = NULL;
-			gchar* _tmp135_ = NULL;
-			gchar* _tmp136_ = NULL;
-			gchar* _tmp137_ = NULL;
-			gchar** _tmp138_ = NULL;
-			gint lineart_scan_modes_length1 = 0;
-			gint _lineart_scan_modes_size_ = 0;
-			ScanJob* _tmp139_ = NULL;
-			ScanMode _tmp140_ = 0;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp101_ = SANE_VALUE_SCAN_MODE_COLOR;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp102_ = g_strdup (_tmp101_);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp103_ = g_strdup ("Color");
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp104_ = g_strdup ("24bit Color");
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp105_ = g_strdup ("Color - 16 Million Colors");
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp106_ = g_new0 (gchar*, 4 + 1);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp106_[0] = _tmp102_;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp106_[1] = _tmp103_;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp106_[2] = _tmp104_;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp106_[3] = _tmp105_;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			color_scan_modes = _tmp106_;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			color_scan_modes_length1 = 4;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_color_scan_modes_size_ = color_scan_modes_length1;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp107_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp108_ = g_strdup (_tmp107_);
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp109_ = g_strdup ("Gray");
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp110_ = g_strdup ("Grayscale");
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp111_ = SANE_I18N ("Grayscale");
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp112_ = g_strdup (_tmp111_);
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp113_ = g_strdup ("True Gray");
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp114_ = g_strdup ("Grayscale - 256 Levels");
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp115_ = g_new0 (gchar*, 6 + 1);
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp115_[0] = _tmp108_;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp115_[1] = _tmp109_;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp115_[2] = _tmp110_;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp115_[3] = _tmp112_;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp115_[4] = _tmp113_;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp115_[5] = _tmp114_;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			gray_scan_modes = _tmp115_;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			gray_scan_modes_length1 = 6;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_gray_scan_modes_size_ = gray_scan_modes_length1;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp116_ = SANE_VALUE_SCAN_MODE_LINEART;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp117_ = g_strdup (_tmp116_);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp118_ = g_strdup ("Lineart");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp119_ = g_strdup ("LineArt");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp120_ = SANE_I18N ("LineArt");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp121_ = g_strdup (_tmp120_);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp122_ = g_strdup ("Black & White");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp123_ = SANE_I18N ("Black & White");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp124_ = g_strdup (_tmp123_);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp125_ = g_strdup ("Binary");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp126_ = SANE_I18N ("Binary");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp127_ = g_strdup (_tmp126_);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp128_ = g_strdup ("Thresholded");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp129_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp130_ = g_strdup (_tmp129_);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp131_ = g_strdup ("Gray");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp132_ = g_strdup ("Grayscale");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp133_ = SANE_I18N ("Grayscale");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp134_ = g_strdup (_tmp133_);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp135_ = g_strdup ("True Gray");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp136_ = g_strdup ("Black and White - Line Art");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp137_ = g_strdup ("Black and White - Halftone");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_ = g_new0 (gchar*, 16 + 1);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[0] = _tmp117_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[1] = _tmp118_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[2] = _tmp119_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[3] = _tmp121_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[4] = _tmp122_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[5] = _tmp124_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[6] = _tmp125_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[7] = _tmp127_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[8] = _tmp128_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[9] = _tmp130_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[10] = _tmp131_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[11] = _tmp132_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[12] = _tmp134_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[13] = _tmp135_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[14] = _tmp136_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp138_[15] = _tmp137_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			lineart_scan_modes = _tmp138_;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			lineart_scan_modes_length1 = 16;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_lineart_scan_modes_size_ = lineart_scan_modes_length1;
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp139_ = job;
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp140_ = _tmp139_->scan_mode;
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			switch (_tmp140_) {
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				case SCAN_MODE_COLOR:
-#line 9563 "scanner.c"
-				{
-					SANE_Handle _tmp141_ = {0};
-					SANE_Option_Descriptor* _tmp142_ = NULL;
-					SANE_Int _tmp143_ = {0};
-					gchar** _tmp144_ = NULL;
-					gint _tmp144__length1 = 0;
-					gboolean _tmp145_ = FALSE;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp141_ = self->priv->handle;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp142_ = option;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp143_ = index;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp144_ = color_scan_modes;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp144__length1 = color_scan_modes_length1;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp145_ = scanner_set_constrained_string_option (self, _tmp141_, _tmp142_, _tmp143_, _tmp144_, _tmp144__length1, NULL);
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp145_) {
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:1015: Unable to set Color mode, please file a bug");
-#line 9587 "scanner.c"
-					}
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 9591 "scanner.c"
-				}
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				case SCAN_MODE_GRAY:
-#line 9595 "scanner.c"
-				{
-					SANE_Handle _tmp146_ = {0};
-					SANE_Option_Descriptor* _tmp147_ = NULL;
-					SANE_Int _tmp148_ = {0};
-					gchar** _tmp149_ = NULL;
-					gint _tmp149__length1 = 0;
-					gboolean _tmp150_ = FALSE;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp146_ = self->priv->handle;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp147_ = option;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp148_ = index;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp149_ = gray_scan_modes;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp149__length1 = gray_scan_modes_length1;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp150_ = scanner_set_constrained_string_option (self, _tmp146_, _tmp147_, _tmp148_, _tmp149_, _tmp149__length1, NULL);
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp150_) {
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:1019: Unable to set Gray mode, please file a bug");
-#line 9619 "scanner.c"
-					}
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 9623 "scanner.c"
-				}
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				case SCAN_MODE_LINEART:
-#line 9627 "scanner.c"
-				{
-					SANE_Handle _tmp151_ = {0};
-					SANE_Option_Descriptor* _tmp152_ = NULL;
-					SANE_Int _tmp153_ = {0};
-					gchar** _tmp154_ = NULL;
-					gint _tmp154__length1 = 0;
-					gboolean _tmp155_ = FALSE;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp151_ = self->priv->handle;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp152_ = option;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp153_ = index;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp154_ = lineart_scan_modes;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp154__length1 = lineart_scan_modes_length1;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp155_ = scanner_set_constrained_string_option (self, _tmp151_, _tmp152_, _tmp153_, _tmp154_, _tmp154__length1, NULL);
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp155_) {
-#line 1023 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:1023: Unable to set Lineart mode, please file a bug");
-#line 9651 "scanner.c"
-					}
-#line 1024 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 9655 "scanner.c"
-				}
-				default:
-				{
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					break;
-#line 9661 "scanner.c"
-				}
-			}
-#line 972 "/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 972 "/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 972 "/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 9670 "scanner.c"
-		}
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp156_ = self->priv->handle;
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp158_ = scanner_get_option_by_name (self, _tmp156_, "duplex", &_tmp157_);
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp157_;
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp158_;
-#line 1032 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp159_ = option;
-#line 1032 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp159_ != NULL) {
-#line 9684 "scanner.c"
-			SANE_Option_Descriptor* _tmp160_ = NULL;
-			SANE_Value_Type _tmp161_ = 0;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp160_ = option;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp161_ = _tmp160_->type;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp161_ == SANE_TYPE_BOOL) {
-#line 9693 "scanner.c"
-				SANE_Handle _tmp162_ = {0};
-				SANE_Option_Descriptor* _tmp163_ = NULL;
-				SANE_Int _tmp164_ = {0};
-				ScanJob* _tmp165_ = NULL;
-				ScanType _tmp166_ = 0;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp162_ = self->priv->handle;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp163_ = option;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp164_ = index;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp165_ = job;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp166_ = _tmp165_->type;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp162_, _tmp163_, _tmp164_, _tmp166_ == SCAN_TYPE_ADF_BOTH, NULL);
-#line 9711 "scanner.c"
-			}
-		}
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp167_ = self->priv->handle;
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp169_ = scanner_get_option_by_name (self, _tmp167_, "batch-scan", &_tmp168_);
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp168_;
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp169_;
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp170_ = option;
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp170_ != NULL) {
-#line 9726 "scanner.c"
-			SANE_Option_Descriptor* _tmp171_ = NULL;
-			SANE_Value_Type _tmp172_ = 0;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp171_ = option;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp172_ = _tmp171_->type;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp172_ == SANE_TYPE_BOOL) {
-#line 9735 "scanner.c"
-				SANE_Handle _tmp173_ = {0};
-				SANE_Option_Descriptor* _tmp174_ = NULL;
-				SANE_Int _tmp175_ = {0};
-				ScanJob* _tmp176_ = NULL;
-				ScanType _tmp177_ = 0;
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp173_ = self->priv->handle;
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp174_ = option;
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp175_ = index;
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp176_ = job;
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp177_ = _tmp176_->type;
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp173_, _tmp174_, _tmp175_, _tmp177_ != SCAN_TYPE_SINGLE, NULL);
-#line 9753 "scanner.c"
-			}
-		}
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp178_ = self->priv->handle;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp180_ = scanner_get_option_by_name (self, _tmp178_, "compression", &_tmp179_);
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp179_;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp180_;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp181_ = option;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp181_ != NULL) {
-#line 9768 "scanner.c"
-			gchar** disable_compression_names = NULL;
-			const gchar* _tmp182_ = NULL;
-			gchar* _tmp183_ = NULL;
-			const gchar* _tmp184_ = NULL;
-			gchar* _tmp185_ = NULL;
-			gchar* _tmp186_ = NULL;
-			gchar* _tmp187_ = NULL;
-			gchar** _tmp188_ = NULL;
-			gint disable_compression_names_length1 = 0;
-			gint _disable_compression_names_size_ = 0;
-			SANE_Handle _tmp189_ = {0};
-			SANE_Option_Descriptor* _tmp190_ = NULL;
-			SANE_Int _tmp191_ = {0};
-			gchar** _tmp192_ = NULL;
-			gint _tmp192__length1 = 0;
-			gboolean _tmp193_ = FALSE;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp182_ = SANE_I18N ("None");
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp183_ = g_strdup (_tmp182_);
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp184_ = SANE_I18N ("none");
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp185_ = g_strdup (_tmp184_);
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp186_ = g_strdup ("None");
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp187_ = g_strdup ("none");
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp188_ = g_new0 (gchar*, 4 + 1);
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp188_[0] = _tmp183_;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp188_[1] = _tmp185_;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp188_[2] = _tmp186_;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp188_[3] = _tmp187_;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			disable_compression_names = _tmp188_;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			disable_compression_names_length1 = 4;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_disable_compression_names_size_ = disable_compression_names_length1;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp189_ = self->priv->handle;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp190_ = option;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp191_ = index;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp192_ = disable_compression_names;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp192__length1 = disable_compression_names_length1;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp193_ = scanner_set_constrained_string_option (self, _tmp189_, _tmp190_, _tmp191_, _tmp192_, _tmp192__length1, NULL);
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (!_tmp193_) {
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				g_warning ("scanner.vala:1059: Unable to disable compression, please file a bug");
-#line 9829 "scanner.c"
-			}
-#line 1048 "/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 9833 "scanner.c"
-		}
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp194_ = self->priv->handle;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp195_ = SANE_NAME_SCAN_RESOLUTION;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp197_ = scanner_get_option_by_name (self, _tmp194_, _tmp195_, &_tmp196_);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp196_;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp197_;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp198_ = option;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp198_ != NULL) {
-#line 9849 "scanner.c"
-			SANE_Handle _tmp199_ = {0};
-			SANE_Option_Descriptor* _tmp200_ = NULL;
-			SANE_Int _tmp201_ = {0};
-			ScanJob* _tmp202_ = NULL;
-			gdouble _tmp203_ = 0.0;
-			ScanJob* _tmp204_ = NULL;
-			gdouble _tmp205_ = 0.0;
-			SANE_Handle _tmp206_ = {0};
-			const gchar* _tmp207_ = NULL;
-			gint _tmp208_ = 0;
-			SANE_Option_Descriptor* _tmp209_ = NULL;
-			SANE_Option_Descriptor* _tmp210_ = NULL;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp199_ = self->priv->handle;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp200_ = option;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp201_ = index;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp202_ = job;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp203_ = _tmp202_->dpi;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp204_ = job;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			scanner_set_fixed_or_int_option (self, _tmp199_, _tmp200_, _tmp201_, _tmp203_, &_tmp205_);
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp204_->dpi = _tmp205_;
-#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp206_ = self->priv->handle;
-#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp207_ = SANE_NAME_BIT_DEPTH;
-#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp209_ = scanner_get_option_by_name (self, _tmp206_, _tmp207_, &_tmp208_);
-#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp208_;
-#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp209_;
-#line 1068 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp210_ = option;
-#line 1068 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp210_ != NULL) {
-#line 9892 "scanner.c"
-				ScanJob* _tmp211_ = NULL;
-				gint _tmp212_ = 0;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp211_ = job;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp212_ = _tmp211_->depth;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp212_ > 0) {
-#line 9901 "scanner.c"
-					SANE_Handle _tmp213_ = {0};
-					SANE_Option_Descriptor* _tmp214_ = NULL;
-					SANE_Int _tmp215_ = {0};
-					ScanJob* _tmp216_ = NULL;
-					gint _tmp217_ = 0;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp213_ = self->priv->handle;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp214_ = option;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp215_ = index;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp216_ = job;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp217_ = _tmp216_->depth;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp213_, _tmp214_, _tmp215_, _tmp217_, NULL);
-#line 9919 "scanner.c"
-				}
-			}
-		}
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp218_ = self->priv->handle;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp219_ = SANE_NAME_SCAN_BR_X;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp221_ = scanner_get_option_by_name (self, _tmp218_, _tmp219_, &_tmp220_);
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp220_;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp221_;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp222_ = option;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp222_ != NULL) {
-#line 9937 "scanner.c"
-			ScanJob* _tmp223_ = NULL;
-			gint _tmp224_ = 0;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp223_ = job;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp224_ = _tmp223_->page_width;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp224_ > 0) {
-#line 9946 "scanner.c"
-				SANE_Handle _tmp225_ = {0};
-				SANE_Option_Descriptor* _tmp226_ = NULL;
-				SANE_Int _tmp227_ = {0};
-				SANE_Option_Descriptor* _tmp228_ = NULL;
-				ScanJob* _tmp229_ = NULL;
-				gint _tmp230_ = 0;
-				ScanJob* _tmp231_ = NULL;
-				gdouble _tmp232_ = 0.0;
-				gdouble _tmp233_ = 0.0;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp225_ = self->priv->handle;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp226_ = option;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp227_ = index;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp228_ = option;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp229_ = job;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp230_ = _tmp229_->page_width;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp231_ = job;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp232_ = _tmp231_->dpi;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp233_ = scanner_convert_page_size (self, _tmp228_, (gdouble) _tmp230_, _tmp232_);
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_fixed_or_int_option (self, _tmp225_, _tmp226_, _tmp227_, _tmp233_, NULL);
-#line 9976 "scanner.c"
-			} else {
-				SANE_Handle _tmp234_ = {0};
-				SANE_Option_Descriptor* _tmp235_ = NULL;
-				SANE_Int _tmp236_ = {0};
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp234_ = self->priv->handle;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp235_ = option;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp236_ = index;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_option_to_max (self, _tmp234_, _tmp235_, _tmp236_);
-#line 9989 "scanner.c"
-			}
-		}
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp237_ = self->priv->handle;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp238_ = SANE_NAME_SCAN_BR_Y;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp240_ = scanner_get_option_by_name (self, _tmp237_, _tmp238_, &_tmp239_);
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp239_;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp240_;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp241_ = option;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp241_ != NULL) {
-#line 10006 "scanner.c"
-			ScanJob* _tmp242_ = NULL;
-			gint _tmp243_ = 0;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp242_ = job;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp243_ = _tmp242_->page_height;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp243_ > 0) {
-#line 10015 "scanner.c"
-				SANE_Handle _tmp244_ = {0};
-				SANE_Option_Descriptor* _tmp245_ = NULL;
-				SANE_Int _tmp246_ = {0};
-				SANE_Option_Descriptor* _tmp247_ = NULL;
-				ScanJob* _tmp248_ = NULL;
-				gint _tmp249_ = 0;
-				ScanJob* _tmp250_ = NULL;
-				gdouble _tmp251_ = 0.0;
-				gdouble _tmp252_ = 0.0;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp244_ = self->priv->handle;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp245_ = option;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp246_ = index;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp247_ = option;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp248_ = job;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp249_ = _tmp248_->page_height;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp250_ = job;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp251_ = _tmp250_->dpi;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp252_ = scanner_convert_page_size (self, _tmp247_, (gdouble) _tmp249_, _tmp251_);
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_fixed_or_int_option (self, _tmp244_, _tmp245_, _tmp246_, _tmp252_, NULL);
-#line 10045 "scanner.c"
-			} else {
-				SANE_Handle _tmp253_ = {0};
-				SANE_Option_Descriptor* _tmp254_ = NULL;
-				SANE_Int _tmp255_ = {0};
-#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp253_ = self->priv->handle;
-#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp254_ = option;
-#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp255_ = index;
-#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_option_to_max (self, _tmp253_, _tmp254_, _tmp255_);
-#line 10058 "scanner.c"
-			}
-		}
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp256_ = self->priv->handle;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp257_ = SANE_NAME_PAGE_WIDTH;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp259_ = scanner_get_option_by_name (self, _tmp256_, _tmp257_, &_tmp258_);
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp258_;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp259_;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp261_ = option;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp261_ != NULL) {
-#line 10075 "scanner.c"
-			ScanJob* _tmp262_ = NULL;
-			gint _tmp263_ = 0;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp262_ = job;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp263_ = _tmp262_->page_width;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp260_ = ((gdouble) _tmp263_) > 0.0;
-#line 10084 "scanner.c"
-		} else {
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp260_ = FALSE;
-#line 10088 "scanner.c"
-		}
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp260_) {
-#line 10092 "scanner.c"
-			SANE_Handle _tmp264_ = {0};
-			SANE_Option_Descriptor* _tmp265_ = NULL;
-			SANE_Int _tmp266_ = {0};
-			SANE_Option_Descriptor* _tmp267_ = NULL;
-			ScanJob* _tmp268_ = NULL;
-			gint _tmp269_ = 0;
-			ScanJob* _tmp270_ = NULL;
-			gdouble _tmp271_ = 0.0;
-			gdouble _tmp272_ = 0.0;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp264_ = self->priv->handle;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp265_ = option;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp266_ = index;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp267_ = option;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp268_ = job;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp269_ = _tmp268_->page_width;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp270_ = job;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp271_ = _tmp270_->dpi;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp272_ = scanner_convert_page_size (self, _tmp267_, (gdouble) _tmp269_, _tmp271_);
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			scanner_set_fixed_or_int_option (self, _tmp264_, _tmp265_, _tmp266_, _tmp272_, NULL);
-#line 10122 "scanner.c"
-		}
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp273_ = self->priv->handle;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp274_ = SANE_NAME_PAGE_HEIGHT;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp276_ = scanner_get_option_by_name (self, _tmp273_, _tmp274_, &_tmp275_);
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp275_;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp276_;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp278_ = option;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp278_ != NULL) {
-#line 10138 "scanner.c"
-			ScanJob* _tmp279_ = NULL;
-			gint _tmp280_ = 0;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp279_ = job;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp280_ = _tmp279_->page_height;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp277_ = ((gdouble) _tmp280_) > 0.0;
-#line 10147 "scanner.c"
-		} else {
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp277_ = FALSE;
-#line 10151 "scanner.c"
-		}
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp277_) {
-#line 10155 "scanner.c"
-			SANE_Handle _tmp281_ = {0};
-			SANE_Option_Descriptor* _tmp282_ = NULL;
-			SANE_Int _tmp283_ = {0};
-			SANE_Option_Descriptor* _tmp284_ = NULL;
-			ScanJob* _tmp285_ = NULL;
-			gint _tmp286_ = 0;
-			ScanJob* _tmp287_ = NULL;
-			gdouble _tmp288_ = 0.0;
-			gdouble _tmp289_ = 0.0;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp281_ = self->priv->handle;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp282_ = option;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp283_ = index;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp284_ = option;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp285_ = job;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp286_ = _tmp285_->page_height;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp287_ = job;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp288_ = _tmp287_->dpi;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp289_ = scanner_convert_page_size (self, _tmp284_, (gdouble) _tmp286_, _tmp288_);
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			scanner_set_fixed_or_int_option (self, _tmp281_, _tmp282_, _tmp283_, _tmp289_, NULL);
-#line 10185 "scanner.c"
-		}
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp290_ = self->priv->handle;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp291_ = SANE_NAME_BRIGHTNESS;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp293_ = scanner_get_option_by_name (self, _tmp290_, _tmp291_, &_tmp292_);
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp292_;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp293_;
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp294_ = option;
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp294_ != NULL) {
-#line 10201 "scanner.c"
-			ScanJob* _tmp295_ = NULL;
-			gint _tmp296_ = 0;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp295_ = job;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp296_ = _tmp295_->brightness;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp296_ != 0) {
-#line 10210 "scanner.c"
-				gint brightness = 0;
-				SANE_Option_Descriptor* _tmp297_ = NULL;
-				ScanJob* _tmp298_ = NULL;
-				gint _tmp299_ = 0;
-				gint _tmp300_ = 0;
-				SANE_Handle _tmp301_ = {0};
-				SANE_Option_Descriptor* _tmp302_ = NULL;
-				SANE_Int _tmp303_ = {0};
-				gint _tmp304_ = 0;
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp297_ = option;
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp298_ = job;
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp299_ = _tmp298_->brightness;
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp300_ = scanner_scale_int (self, -100, 100, _tmp297_, _tmp299_);
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				brightness = _tmp300_;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp301_ = self->priv->handle;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp302_ = option;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp303_ = index;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp304_ = brightness;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp301_, _tmp302_, _tmp303_, _tmp304_, NULL);
-#line 10240 "scanner.c"
-			}
-		}
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp305_ = self->priv->handle;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp306_ = SANE_NAME_CONTRAST;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp308_ = scanner_get_option_by_name (self, _tmp305_, _tmp306_, &_tmp307_);
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp307_;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp308_;
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp309_ = option;
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp309_ != NULL) {
-#line 10257 "scanner.c"
-			ScanJob* _tmp310_ = NULL;
-			gint _tmp311_ = 0;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp310_ = job;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp311_ = _tmp310_->contrast;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp311_ != 0) {
-#line 10266 "scanner.c"
-				gint contrast = 0;
-				SANE_Option_Descriptor* _tmp312_ = NULL;
-				ScanJob* _tmp313_ = NULL;
-				gint _tmp314_ = 0;
-				gint _tmp315_ = 0;
-				SANE_Handle _tmp316_ = {0};
-				SANE_Option_Descriptor* _tmp317_ = NULL;
-				SANE_Int _tmp318_ = {0};
-				gint _tmp319_ = 0;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp312_ = option;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp313_ = job;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp314_ = _tmp313_->contrast;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp315_ = scanner_scale_int (self, -100, 100, _tmp312_, _tmp314_);
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				contrast = _tmp315_;
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp316_ = self->priv->handle;
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp317_ = option;
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp318_ = index;
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp319_ = contrast;
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp316_, _tmp317_, _tmp318_, _tmp319_, NULL);
-#line 10296 "scanner.c"
-			}
-		}
-#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp320_ = self->priv->current_device;
-#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (g_strcmp0 (_tmp320_, "test") == 0) {
-#line 10303 "scanner.c"
-			SANE_Handle _tmp321_ = {0};
-			gint _tmp322_ = 0;
-			SANE_Option_Descriptor* _tmp323_ = NULL;
-			SANE_Option_Descriptor* _tmp324_ = NULL;
-			SANE_Handle _tmp328_ = {0};
-			gint _tmp329_ = 0;
-			SANE_Option_Descriptor* _tmp330_ = NULL;
-			SANE_Option_Descriptor* _tmp331_ = NULL;
-			SANE_Handle _tmp335_ = {0};
-			gint _tmp336_ = 0;
-			SANE_Option_Descriptor* _tmp337_ = NULL;
-			SANE_Option_Descriptor* _tmp338_ = NULL;
-			SANE_Handle _tmp342_ = {0};
-			gint _tmp343_ = 0;
-			SANE_Option_Descriptor* _tmp344_ = NULL;
-			SANE_Option_Descriptor* _tmp345_ = NULL;
-			SANE_Handle _tmp349_ = {0};
-			gint _tmp350_ = 0;
-			SANE_Option_Descriptor* _tmp351_ = NULL;
-			SANE_Option_Descriptor* _tmp352_ = NULL;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp321_ = self->priv->handle;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp323_ = scanner_get_option_by_name (self, _tmp321_, "hand-scanner", &_tmp322_);
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp322_;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp323_;
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp324_ = option;
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp324_ != NULL) {
-#line 10336 "scanner.c"
-				SANE_Handle _tmp325_ = {0};
-				SANE_Option_Descriptor* _tmp326_ = NULL;
-				SANE_Int _tmp327_ = {0};
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp325_ = self->priv->handle;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp326_ = option;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp327_ = index;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp325_, _tmp326_, _tmp327_, FALSE, NULL);
-#line 10348 "scanner.c"
-			}
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp328_ = self->priv->handle;
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp330_ = scanner_get_option_by_name (self, _tmp328_, "three-pass", &_tmp329_);
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp329_;
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp330_;
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp331_ = option;
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp331_ != NULL) {
-#line 10362 "scanner.c"
-				SANE_Handle _tmp332_ = {0};
-				SANE_Option_Descriptor* _tmp333_ = NULL;
-				SANE_Int _tmp334_ = {0};
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp332_ = self->priv->handle;
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp333_ = option;
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp334_ = index;
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp332_, _tmp333_, _tmp334_, FALSE, NULL);
-#line 10374 "scanner.c"
-			}
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp335_ = self->priv->handle;
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp337_ = scanner_get_option_by_name (self, _tmp335_, "test-picture", &_tmp336_);
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp336_;
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp337_;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp338_ = option;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp338_ != NULL) {
-#line 10388 "scanner.c"
-				SANE_Handle _tmp339_ = {0};
-				SANE_Option_Descriptor* _tmp340_ = NULL;
-				SANE_Int _tmp341_ = {0};
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp339_ = self->priv->handle;
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp340_ = option;
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp341_ = index;
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_string_option (self, _tmp339_, _tmp340_, _tmp341_, "Color pattern", NULL);
-#line 10400 "scanner.c"
-			}
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp342_ = self->priv->handle;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp344_ = scanner_get_option_by_name (self, _tmp342_, "read-delay", &_tmp343_);
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp343_;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp344_;
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp345_ = option;
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp345_ != NULL) {
-#line 10414 "scanner.c"
-				SANE_Handle _tmp346_ = {0};
-				SANE_Option_Descriptor* _tmp347_ = NULL;
-				SANE_Int _tmp348_ = {0};
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp346_ = self->priv->handle;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp347_ = option;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp348_ = index;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp346_, _tmp347_, _tmp348_, TRUE, NULL);
-#line 10426 "scanner.c"
-			}
-#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp349_ = self->priv->handle;
-#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp351_ = scanner_get_option_by_name (self, _tmp349_, "read-delay-duration", &_tmp350_);
-#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp350_;
-#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp351_;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp352_ = option;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp352_ != NULL) {
-#line 10440 "scanner.c"
-				SANE_Handle _tmp353_ = {0};
-				SANE_Option_Descriptor* _tmp354_ = NULL;
-				SANE_Int _tmp355_ = {0};
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp353_ = self->priv->handle;
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp354_ = option;
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp355_ = index;
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp353_, _tmp354_, _tmp355_, 200000, NULL);
-#line 10452 "scanner.c"
-			}
-		}
-#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_START;
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 10461 "scanner.c"
-	}
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp356_ = index;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp357_ = option;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_log_option (self, _tmp356_, _tmp357_);
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp358_ = option;
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp359_ = _tmp358_->type;
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp359_ == SANE_TYPE_GROUP) {
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 10479 "scanner.c"
-	}
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp360_ = option;
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp361_ = _tmp360_->cap;
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if ((_tmp361_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 10491 "scanner.c"
-	}
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp362_ = option;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp363_ = _tmp362_->name;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp363_ == NULL) {
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 10503 "scanner.c"
-	}
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp364_ = self->priv->options;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp365_ = option;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp366_ = _tmp365_->name;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp367_ = g_strdup (_tmp366_);
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp368_ = index;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_hash_table_insert (_tmp364_, _tmp367_, (gpointer) ((gintptr) ((gint) _tmp368_)));
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_scan_job_unref0 (job);
-#line 10519 "scanner.c"
-}
-
-
-static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor* option, gdouble size, gdouble dpi) {
-	gdouble result = 0.0;
-	SANE_Option_Descriptor* _tmp0_ = NULL;
-	SANE_Unit _tmp1_ = 0;
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (self != NULL, 0.0);
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (option != NULL, 0.0);
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = option;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = _tmp0_->unit;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp1_ == SANE_UNIT_PIXEL) {
-#line 10537 "scanner.c"
-		gdouble _tmp2_ = 0.0;
-		gdouble _tmp3_ = 0.0;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp2_ = dpi;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp3_ = size;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		result = (_tmp2_ * _tmp3_) / 254.0;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return result;
-#line 10548 "scanner.c"
-	} else {
-		SANE_Option_Descriptor* _tmp4_ = NULL;
-		SANE_Unit _tmp5_ = 0;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp4_ = option;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp5_ = _tmp4_->unit;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp5_ == SANE_UNIT_MM) {
-#line 10558 "scanner.c"
-			gdouble _tmp6_ = 0.0;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp6_ = size;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp6_ / 10.0;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 10566 "scanner.c"
-		} else {
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1169: Unable to set unsupported unit type");
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = (gdouble) 0.0f;
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 10574 "scanner.c"
-		}
-	}
-}
-
-
-static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_Handle handle, const gchar* name, gint* index) {
-	gint _vala_index = 0;
-	SANE_Option_Descriptor* result = NULL;
-	GHashTable* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gconstpointer _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	SANE_Handle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	SANE_Option_Descriptor* _tmp6_ = NULL;
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (name != NULL, NULL);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->options;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = name;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = g_hash_table_lookup (_tmp0_, _tmp1_);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_index = (gint) ((gintptr) _tmp2_);
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = _vala_index;
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp3_ == 0) {
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		result = NULL;
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (index) {
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			*index = _vala_index;
-#line 10612 "scanner.c"
-		}
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return result;
-#line 10616 "scanner.c"
-	}
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = handle;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = _vala_index;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = sane_get_option_descriptor (_tmp4_, (SANE_Int) _tmp5_);
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	result = _tmp6_;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (index) {
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		*index = _vala_index;
-#line 10630 "scanner.c"
-	}
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return result;
-#line 10634 "scanner.c"
-}
-
-
-static void scanner_do_complete_document (Scanner* self) {
-	SANE_Handle _tmp0_ = {0};
-	GList* _tmp1_ = NULL;
-	GList* _tmp2_ = NULL;
-	NotifyDocumentDone* _tmp3_ = NULL;
-	NotifyDocumentDone* _tmp4_ = NULL;
-#line 1183 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->handle;
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	sane_cancel (_tmp0_);
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1186: sane_cancel ()");
-#line 1188 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = self->priv->job_queue;
-#line 1188 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->job_queue = g_list_remove_link (self->priv->job_queue, _tmp1_);
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->state = SCAN_STATE_IDLE;
-#line 1193 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = self->priv->job_queue;
-#line 1193 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp2_ != NULL) {
-#line 1195 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_OPEN;
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 10666 "scanner.c"
-	}
-#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = notify_document_done_new ();
-#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = _tmp3_;
-#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_notify (self, (Notify*) _tmp4_);
-#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_notify_unref0 (_tmp4_);
-#line 1203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_set_scanning (self, FALSE);
-#line 10678 "scanner.c"
-}
-
-
-static void scanner_do_start (Scanner* self) {
-	SANE_Status status = 0;
-	NotifyExpectPage* _tmp0_ = NULL;
-	NotifyExpectPage* _tmp1_ = NULL;
-	SANE_Handle _tmp2_ = {0};
-	SANE_Status _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	SANE_Status _tmp6_ = 0;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	SANE_Status _tmp9_ = 0;
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = notify_expect_page_new ();
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = _tmp0_;
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_notify (self, (Notify*) _tmp1_);
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_notify_unref0 (_tmp1_);
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = self->priv->handle;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = sane_start (_tmp2_);
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp3_;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = self->priv->page_number;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = self->priv->pass_number;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = status;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = sane_status_to_string (_tmp6_);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp8_ = _tmp7_;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1213: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp8_);
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp9_ = status;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp9_ == SANE_STATUS_GOOD) {
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_GET_PARAMETERS;
-#line 10730 "scanner.c"
-	} else {
-		SANE_Status _tmp10_ = 0;
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp10_ = status;
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			scanner_do_complete_document (self);
-#line 10739 "scanner.c"
-		} else {
-			SANE_Status _tmp11_ = 0;
-			const gchar* _tmp12_ = NULL;
-			SANE_Status _tmp13_ = 0;
-			const gchar* _tmp14_ = NULL;
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp11_ = status;
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp12_ = sane_strstatus (_tmp11_);
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1220: Unable to start device: %s", _tmp12_);
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp13_ = status;
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp14_ = _ ("Unable to start scan");
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
-#line 10757 "scanner.c"
-		}
-	}
-}
-
-
-static gchar* sane_frame_to_string (SANE_Frame frame) {
-	gchar* result = NULL;
-	SANE_Frame _tmp0_ = 0;
-#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 10772 "scanner.c"
-		{
-			gchar* _tmp1_ = NULL;
-#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 10781 "scanner.c"
-		}
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_FRAME_RGB:
-#line 10785 "scanner.c"
-		{
-			gchar* _tmp2_ = NULL;
-#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 10794 "scanner.c"
-		}
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_FRAME_RED:
-#line 10798 "scanner.c"
-		{
-			gchar* _tmp3_ = NULL;
-#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 10807 "scanner.c"
-		}
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_FRAME_GREEN:
-#line 10811 "scanner.c"
-		{
-			gchar* _tmp4_ = NULL;
-#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 10820 "scanner.c"
-		}
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
-		case SANE_FRAME_BLUE:
-#line 10824 "scanner.c"
-		{
-			gchar* _tmp5_ = NULL;
-#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 10833 "scanner.c"
-		}
-		default:
-		{
-			SANE_Frame _tmp6_ = 0;
-			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 10847 "scanner.c"
-		}
-	}
-}
-
-
-static void scanner_do_get_parameters (Scanner* self) {
-	SANE_Status status = 0;
-	SANE_Handle _tmp0_ = {0};
-	SANE_Parameters _tmp1_ = {0};
-	SANE_Status _tmp2_ = 0;
-	SANE_Status _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	SANE_Status _tmp6_ = 0;
-	ScanJob* job = NULL;
-	GList* _tmp11_ = NULL;
-	gconstpointer _tmp12_ = NULL;
-	ScanJob* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	SANE_Parameters _tmp15_ = {0};
-	gboolean _tmp16_ = FALSE;
-	SANE_Parameters _tmp17_ = {0};
-	SANE_Frame _tmp18_ = 0;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	SANE_Parameters _tmp21_ = {0};
-	gint _tmp22_ = 0;
-	SANE_Parameters _tmp23_ = {0};
-	gint _tmp24_ = 0;
-	SANE_Parameters _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	SANE_Parameters _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	ScanPageInfo* info = NULL;
-	ScanPageInfo* _tmp29_ = NULL;
-	ScanPageInfo* _tmp30_ = NULL;
-	SANE_Parameters _tmp31_ = {0};
-	gint _tmp32_ = 0;
-	ScanPageInfo* _tmp33_ = NULL;
-	SANE_Parameters _tmp34_ = {0};
-	gint _tmp35_ = 0;
-	ScanPageInfo* _tmp36_ = NULL;
-	SANE_Parameters _tmp37_ = {0};
-	gint _tmp38_ = 0;
-	gboolean _tmp39_ = FALSE;
-	gboolean _tmp40_ = FALSE;
-	gboolean _tmp41_ = FALSE;
-	SANE_Parameters _tmp42_ = {0};
-	gint _tmp43_ = 0;
-	gint _tmp53_ = 0;
-	SANE_Parameters _tmp54_ = {0};
-	SANE_Frame _tmp55_ = 0;
-	ScanPageInfo* _tmp56_ = NULL;
-	ScanPageInfo* _tmp57_ = NULL;
-	ScanJob* _tmp58_ = NULL;
-	gdouble _tmp59_ = 0.0;
-	ScanPageInfo* _tmp60_ = NULL;
-	const gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
-	gint _tmp63_ = 0;
-	gint _tmp64_ = 0;
-	gint buffer_size = 0;
-	SANE_Parameters _tmp71_ = {0};
-	gint _tmp72_ = 0;
-	gint _tmp73_ = 0;
-	guchar* _tmp74_ = NULL;
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->handle;
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = sane_get_parameters (_tmp0_, &_tmp1_);
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->parameters = _tmp1_;
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp2_;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = status;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = sane_status_to_string (_tmp3_);
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = _tmp4_;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1230: sane_get_parameters () -> %s", _tmp5_);
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp5_);
-#line 1231 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = status;
-#line 1231 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp6_ != SANE_STATUS_GOOD) {
-#line 10938 "scanner.c"
-		SANE_Status _tmp7_ = 0;
-		const gchar* _tmp8_ = NULL;
-		SANE_Status _tmp9_ = 0;
-		const gchar* _tmp10_ = NULL;
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = status;
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = sane_strstatus (_tmp7_);
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1233: Unable to get device parameters: %s", _tmp8_);
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp9_ = status;
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp10_ = _ ("Error communicating with scanner");
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 10957 "scanner.c"
-	}
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp11_ = self->priv->job_queue;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp12_ = _tmp11_->data;
-#line 1240 "/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 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	job = _tmp13_;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp15_ = self->priv->parameters;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp16_ = _tmp15_.last_frame;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp16_) {
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = "SANE_TRUE";
-#line 10975 "scanner.c"
-	} else {
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = "SANE_FALSE";
-#line 10979 "scanner.c"
-	}
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp17_ = self->priv->parameters;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp18_ = _tmp17_.format;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp19_ = sane_frame_to_string (_tmp18_);
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp20_ = _tmp19_;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp21_ = self->priv->parameters;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp22_ = _tmp21_.bytes_per_line;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp23_ = self->priv->parameters;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp24_ = _tmp23_.pixels_per_line;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_ = self->priv->parameters;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26_ = _tmp25_.lines;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_ = self->priv->parameters;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28_ = _tmp27_.depth;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1242: Parameters: format=%s last_frame=%s bytes_per_line=" \
-"%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp14_, _tmp22_, _tmp24_, _tmp26_, _tmp28_);
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp20_);
-#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp29_ = scan_page_info_new ();
-#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	info = _tmp29_;
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_ = info;
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp31_ = self->priv->parameters;
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp32_ = _tmp31_.pixels_per_line;
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_->width = _tmp32_;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_ = info;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp34_ = self->priv->parameters;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp35_ = _tmp34_.lines;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_->height = _tmp35_;
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_ = info;
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp37_ = self->priv->parameters;
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp38_ = _tmp37_.depth;
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_->depth = _tmp38_;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_ = self->priv->parameters;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = _tmp42_.depth;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp43_ == 8) {
-#line 11043 "scanner.c"
-		SANE_Parameters _tmp44_ = {0};
-		SANE_Frame _tmp45_ = 0;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp44_ = self->priv->parameters;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp45_ = _tmp44_.format;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp41_ = _tmp45_ == SANE_FRAME_GRAY;
-#line 11052 "scanner.c"
-	} else {
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp41_ = FALSE;
-#line 11056 "scanner.c"
-	}
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp41_) {
-#line 11060 "scanner.c"
-		ScanJob* _tmp46_ = NULL;
-		gint _tmp47_ = 0;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp46_ = job;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp47_ = _tmp46_->depth;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp40_ = _tmp47_ == 2;
-#line 11069 "scanner.c"
-	} else {
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp40_ = FALSE;
-#line 11073 "scanner.c"
-	}
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp40_) {
-#line 11077 "scanner.c"
-		ScanJob* _tmp48_ = NULL;
-		ScanMode _tmp49_ = 0;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp48_ = job;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp49_ = _tmp48_->scan_mode;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp39_ = _tmp49_ == SCAN_MODE_GRAY;
-#line 11086 "scanner.c"
-	} else {
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp39_ = FALSE;
-#line 11090 "scanner.c"
-	}
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp39_) {
-#line 11094 "scanner.c"
-		ScanPageInfo* _tmp50_ = NULL;
-		ScanJob* _tmp51_ = NULL;
-		gint _tmp52_ = 0;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp50_ = info;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp51_ = job;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp52_ = _tmp51_->depth;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp50_->depth = _tmp52_;
-#line 11106 "scanner.c"
-	}
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp54_ = self->priv->parameters;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp55_ = _tmp54_.format;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp55_ == SANE_FRAME_GRAY) {
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp53_ = 1;
-#line 11116 "scanner.c"
-	} else {
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp53_ = 3;
-#line 11120 "scanner.c"
-	}
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp56_ = info;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp56_->n_channels = _tmp53_;
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp57_ = info;
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp58_ = job;
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp59_ = _tmp58_->dpi;
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp57_->dpi = _tmp59_;
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp60_ = info;
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp61_ = self->priv->current_device;
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp62_ = g_strdup (_tmp61_);
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp60_->device);
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp60_->device = _tmp62_;
-#line 1262 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp63_ = self->priv->page_number;
-#line 1262 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp64_ = self->priv->notified_page;
-#line 1262 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp63_ != _tmp64_) {
-#line 11150 "scanner.c"
-		ScanJob* _tmp65_ = NULL;
-		gint _tmp66_ = 0;
-		ScanPageInfo* _tmp67_ = NULL;
-		NotifyGotPageInfo* _tmp68_ = NULL;
-		NotifyGotPageInfo* _tmp69_ = NULL;
-		gint _tmp70_ = 0;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp65_ = job;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp66_ = _tmp65_->id;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp67_ = info;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp68_ = notify_got_page_info_new (_tmp66_, _tmp67_);
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp69_ = _tmp68_;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_notify (self, (Notify*) _tmp69_);
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_notify_unref0 (_tmp69_);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp70_ = self->priv->page_number;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->notified_page = _tmp70_;
-#line 11175 "scanner.c"
-	}
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp71_ = self->priv->parameters;
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp72_ = _tmp71_.bytes_per_line;
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	buffer_size = _tmp72_ + 1;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp73_ = buffer_size;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp74_ = g_new0 (guchar, _tmp73_);
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->buffer = _tmp74_;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->buffer_length1 = _tmp73_;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->n_used = 0;
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->line_count = 0;
-#line 1273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->pass_number = 0;
-#line 1274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->state = SCAN_STATE_READ;
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_scan_page_info_unref0 (info);
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_scan_job_unref0 (job);
-#line 11207 "scanner.c"
-}
-
-
-static void scanner_do_complete_page (Scanner* self) {
-	ScanJob* job = NULL;
-	GList* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	ScanJob* _tmp2_ = NULL;
-	ScanJob* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	NotifyPageDone* _tmp5_ = NULL;
-	NotifyPageDone* _tmp6_ = NULL;
-	SANE_Parameters _tmp7_ = {0};
-	gboolean _tmp8_ = FALSE;
-	ScanJob* _tmp10_ = NULL;
-	ScanType _tmp11_ = 0;
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->job_queue;
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = _tmp0_->data;
-#line 1279 "/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 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	job = _tmp2_;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = job;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = _tmp3_->id;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = notify_page_done_new (_tmp4_);
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = _tmp5_;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_notify (self, (Notify*) _tmp6_);
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_notify_unref0 (_tmp6_);
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = self->priv->parameters;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp8_ = _tmp7_.last_frame;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (!_tmp8_) {
-#line 11252 "scanner.c"
-		gint _tmp9_ = 0;
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp9_ = self->priv->pass_number;
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->pass_number = _tmp9_ + 1;
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_START;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 11264 "scanner.c"
-	}
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp10_ = job;
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp11_ = _tmp10_->type;
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp11_ != SCAN_TYPE_SINGLE) {
-#line 11272 "scanner.c"
-		gint _tmp12_ = 0;
-		ScanJob* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		NotifyPageDone* _tmp15_ = NULL;
-		NotifyPageDone* _tmp16_ = NULL;
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp12_ = self->priv->page_number;
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->page_number = _tmp12_ + 1;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->pass_number = 0;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp13_ = job;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = _tmp13_->id;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp15_ = notify_page_done_new (_tmp14_);
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp16_ = _tmp15_;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_notify (self, (Notify*) _tmp16_);
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_notify_unref0 (_tmp16_);
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->state = SCAN_STATE_START;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 11302 "scanner.c"
-	}
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_do_complete_document (self);
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_scan_job_unref0 (job);
-#line 11308 "scanner.c"
-}
-
-
-static void scanner_do_read (Scanner* self) {
-	ScanJob* job = NULL;
-	GList* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	ScanJob* _tmp2_ = NULL;
-	gint n_to_read = 0;
-	guchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gint _tmp4_ = 0;
-	SANE_Int n_read = {0};
-	guchar* b = NULL;
-	guchar* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	SANE_Status status = 0;
-	SANE_Handle _tmp6_ = {0};
-	guchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	SANE_Int _tmp10_ = {0};
-	SANE_Status _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	SANE_Status _tmp13_ = 0;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	SANE_Int _tmp16_ = {0};
-	SANE_Status _tmp17_ = 0;
-	SANE_Status _tmp29_ = 0;
-	gboolean full_read = FALSE;
-	gboolean _tmp34_ = FALSE;
-	gint _tmp35_ = 0;
-	gint _tmp38_ = 0;
-	SANE_Int _tmp39_ = {0};
-	gint _tmp40_ = 0;
-	SANE_Parameters _tmp41_ = {0};
-	gint _tmp42_ = 0;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->job_queue;
-#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = _tmp0_->data;
-#line 1306 "/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 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	job = _tmp2_;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = self->priv->buffer;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3__length1 = self->priv->buffer_length1;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = self->priv->n_used;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	n_to_read = _tmp3__length1 - _tmp4_;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = self->priv->buffer;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5__length1 = self->priv->buffer_length1;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	b = (guchar*) _tmp5_;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = self->priv->handle;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = b;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp8_ = self->priv->n_used;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp9_ = n_to_read;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp11_ = sane_read (_tmp6_, (guint8*) (_tmp7_ + _tmp8_), (SANE_Int) _tmp9_, &_tmp10_);
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	n_read = _tmp10_;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp11_;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp12_ = n_to_read;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp13_ = status;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp14_ = sane_status_to_string (_tmp13_);
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp15_ = _tmp14_;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp16_ = n_read;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1314: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp15_);
-#line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp17_ = status;
-#line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp17_ == SANE_STATUS_EOF) {
-#line 11403 "scanner.c"
-		gboolean _tmp18_ = FALSE;
-		SANE_Parameters _tmp19_ = {0};
-		gint _tmp20_ = 0;
-		gint _tmp27_ = 0;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp19_ = self->priv->parameters;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp20_ = _tmp19_.lines;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp20_ > 0) {
-#line 11414 "scanner.c"
-			gint _tmp21_ = 0;
-			SANE_Parameters _tmp22_ = {0};
-			gint _tmp23_ = 0;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp21_ = self->priv->line_count;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp22_ = self->priv->parameters;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp23_ = _tmp22_.lines;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp18_ = _tmp21_ != _tmp23_;
-#line 11426 "scanner.c"
-		} else {
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp18_ = FALSE;
-#line 11430 "scanner.c"
-		}
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp18_) {
-#line 11434 "scanner.c"
-			gint _tmp24_ = 0;
-			SANE_Parameters _tmp25_ = {0};
-			gint _tmp26_ = 0;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp24_ = self->priv->line_count;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp25_ = self->priv->parameters;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp26_ = _tmp25_.lines;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1320: Scan completed with %d lines, expected %d lines", _tmp24_, _tmp26_);
-#line 11446 "scanner.c"
-		}
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp27_ = self->priv->n_used;
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp27_ > 0) {
-#line 11452 "scanner.c"
-			gint _tmp28_ = 0;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp28_ = self->priv->n_used;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1322: Scan complete with %d bytes of unused data", _tmp28_);
-#line 11458 "scanner.c"
-		}
-#line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_do_complete_page (self);
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 11466 "scanner.c"
-	}
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp29_ = status;
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp29_ != SANE_STATUS_GOOD) {
-#line 11472 "scanner.c"
-		SANE_Status _tmp30_ = 0;
-		const gchar* _tmp31_ = NULL;
-		SANE_Status _tmp32_ = 0;
-		const gchar* _tmp33_ = NULL;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp30_ = status;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp31_ = sane_strstatus (_tmp30_);
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1330: Unable to read frame from device: %s", _tmp31_);
-#line 1331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp32_ = status;
-#line 1331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp33_ = _ ("Error communicating with scanner");
-#line 1331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_fail_scan (self, (gint) _tmp32_, _tmp33_);
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_job_unref0 (job);
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 11493 "scanner.c"
-	}
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	full_read = FALSE;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp35_ = self->priv->n_used;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp35_ == 0) {
-#line 11501 "scanner.c"
-		SANE_Int _tmp36_ = {0};
-		guchar* _tmp37_ = NULL;
-		gint _tmp37__length1 = 0;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp36_ = n_read;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp37_ = self->priv->buffer;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp37__length1 = self->priv->buffer_length1;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp34_ = _tmp36_ == ((SANE_Int) _tmp37__length1);
-#line 11513 "scanner.c"
-	} else {
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp34_ = FALSE;
-#line 11517 "scanner.c"
-	}
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp34_) {
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		full_read = TRUE;
-#line 11523 "scanner.c"
-	}
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp38_ = self->priv->n_used;
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp39_ = n_read;
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->n_used = _tmp38_ + ((gint) _tmp39_);
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp40_ = self->priv->n_used;
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp41_ = self->priv->parameters;
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_ = _tmp41_.bytes_per_line;
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp40_ >= _tmp42_) {
-#line 11539 "scanner.c"
-		ScanLine* line = NULL;
-		ScanLine* _tmp43_ = NULL;
-		SANE_Parameters _tmp44_ = {0};
-		SANE_Frame _tmp45_ = 0;
-		ScanLine* _tmp51_ = NULL;
-		SANE_Parameters _tmp52_ = {0};
-		gint _tmp53_ = 0;
-		ScanLine* _tmp54_ = NULL;
-		SANE_Parameters _tmp55_ = {0};
-		gint _tmp56_ = 0;
-		ScanLine* _tmp57_ = NULL;
-		guchar* _tmp58_ = NULL;
-		gint _tmp58__length1 = 0;
-		ScanLine* _tmp59_ = NULL;
-		SANE_Parameters _tmp60_ = {0};
-		gint _tmp61_ = 0;
-		ScanLine* _tmp62_ = NULL;
-		gint _tmp63_ = 0;
-		ScanLine* _tmp64_ = NULL;
-		gint _tmp65_ = 0;
-		ScanLine* _tmp66_ = NULL;
-		gint _tmp67_ = 0;
-		gint _tmp68_ = 0;
-		ScanLine* _tmp69_ = NULL;
-		gint _tmp70_ = 0;
-		gint buffer_size = 0;
-		ScanLine* _tmp71_ = NULL;
-		guchar* _tmp72_ = NULL;
-		gint _tmp72__length1 = 0;
-		gboolean _tmp73_ = FALSE;
-		gint _tmp77_ = 0;
-		guchar* _tmp78_ = NULL;
-		gint n_remaining = 0;
-		gint _tmp79_ = 0;
-		ScanLine* _tmp80_ = NULL;
-		gint _tmp81_ = 0;
-		ScanLine* _tmp82_ = NULL;
-		gint _tmp83_ = 0;
-		gboolean _tmp100_ = FALSE;
-		gboolean _tmp101_ = FALSE;
-		gboolean _tmp102_ = FALSE;
-		SANE_Parameters _tmp103_ = {0};
-		gint _tmp104_ = 0;
-		ScanJob* _tmp153_ = NULL;
-		gint _tmp154_ = 0;
-		ScanLine* _tmp155_ = NULL;
-		NotifyGotLine* _tmp156_ = NULL;
-		NotifyGotLine* _tmp157_ = NULL;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp43_ = scan_line_new ();
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		line = _tmp43_;
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp44_ = self->priv->parameters;
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp45_ = _tmp44_.format;
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		switch (_tmp45_) {
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SANE_FRAME_GRAY:
-#line 11600 "scanner.c"
-			{
-				ScanLine* _tmp46_ = NULL;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp46_ = line;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp46_->channel = 0;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 11609 "scanner.c"
-			}
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SANE_FRAME_RGB:
-#line 11613 "scanner.c"
-			{
-				ScanLine* _tmp47_ = NULL;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp47_ = line;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp47_->channel = -1;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 11622 "scanner.c"
-			}
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SANE_FRAME_RED:
-#line 11626 "scanner.c"
-			{
-				ScanLine* _tmp48_ = NULL;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp48_ = line;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp48_->channel = 0;
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 11635 "scanner.c"
-			}
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SANE_FRAME_GREEN:
-#line 11639 "scanner.c"
-			{
-				ScanLine* _tmp49_ = NULL;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp49_ = line;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp49_->channel = 1;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 11648 "scanner.c"
-			}
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SANE_FRAME_BLUE:
-#line 11652 "scanner.c"
-			{
-				ScanLine* _tmp50_ = NULL;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp50_ = line;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp50_->channel = 2;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 11661 "scanner.c"
-			}
-			default:
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 11666 "scanner.c"
-		}
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp51_ = line;
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp52_ = self->priv->parameters;
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp53_ = _tmp52_.pixels_per_line;
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp51_->width = _tmp53_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp54_ = line;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp55_ = self->priv->parameters;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp56_ = _tmp55_.depth;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp54_->depth = _tmp56_;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp57_ = line;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp58_ = self->priv->buffer;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp58__length1 = self->priv->buffer_length1;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->buffer = NULL;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->buffer_length1 = 0;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp57_->data = (g_free (_tmp57_->data), NULL);
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp57_->data = _tmp58_;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp57_->data_length1 = _tmp58__length1;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp59_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp60_ = self->priv->parameters;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp61_ = _tmp60_.bytes_per_line;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp59_->data_length = _tmp61_;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp62_ = line;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp63_ = self->priv->line_count;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp62_->number = _tmp63_;
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp64_ = line;
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp65_ = self->priv->n_used;
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp66_ = line;
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp67_ = _tmp66_->data_length;
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp64_->n_lines = _tmp65_ / _tmp67_;
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp68_ = self->priv->line_count;
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp69_ = line;
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp70_ = _tmp69_->n_lines;
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->line_count = _tmp68_ + _tmp70_;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp71_ = line;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp72_ = _tmp71_->data;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp72__length1 = _tmp71_->data_length1;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		buffer_size = _tmp72__length1;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp73_ = full_read;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp73_) {
-#line 11744 "scanner.c"
-			gint _tmp74_ = 0;
-			SANE_Parameters _tmp75_ = {0};
-			gint _tmp76_ = 0;
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp74_ = buffer_size;
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp75_ = self->priv->parameters;
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp76_ = _tmp75_.bytes_per_line;
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			buffer_size = _tmp74_ + _tmp76_;
-#line 11756 "scanner.c"
-		}
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp77_ = buffer_size;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp78_ = g_new0 (guchar, _tmp77_);
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->buffer = _tmp78_;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->buffer_length1 = _tmp77_;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp79_ = self->priv->n_used;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp80_ = line;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp81_ = _tmp80_->n_lines;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp82_ = line;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp83_ = _tmp82_->data_length;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		n_remaining = _tmp79_ - (_tmp81_ * _tmp83_);
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->n_used = 0;
-#line 11784 "scanner.c"
-		{
-			gint i = 0;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			i = 0;
-#line 11789 "scanner.c"
-			{
-				gboolean _tmp84_ = FALSE;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp84_ = TRUE;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				while (TRUE) {
-#line 11796 "scanner.c"
-					gint _tmp86_ = 0;
-					gint _tmp87_ = 0;
-					guchar* _tmp88_ = NULL;
-					gint _tmp88__length1 = 0;
-					gint _tmp89_ = 0;
-					ScanLine* _tmp90_ = NULL;
-					guchar* _tmp91_ = NULL;
-					gint _tmp91__length1 = 0;
-					gint _tmp92_ = 0;
-					ScanLine* _tmp93_ = NULL;
-					gint _tmp94_ = 0;
-					ScanLine* _tmp95_ = NULL;
-					gint _tmp96_ = 0;
-					guchar _tmp97_ = '\0';
-					guchar _tmp98_ = '\0';
-					gint _tmp99_ = 0;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp84_) {
-#line 11815 "scanner.c"
-						gint _tmp85_ = 0;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp85_ = i;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						i = _tmp85_ + 1;
-#line 11821 "scanner.c"
-					}
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp84_ = FALSE;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp86_ = i;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp87_ = n_remaining;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!(_tmp86_ < _tmp87_)) {
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						break;
-#line 11833 "scanner.c"
-					}
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp88_ = self->priv->buffer;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp88__length1 = self->priv->buffer_length1;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp89_ = i;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp90_ = line;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp91_ = _tmp90_->data;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp91__length1 = _tmp90_->data_length1;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp92_ = i;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp93_ = line;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp94_ = _tmp93_->n_lines;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp95_ = line;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp96_ = _tmp95_->data_length;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp97_ = _tmp91_[_tmp92_ + (_tmp94_ * _tmp96_)];
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp88_[_tmp89_] = _tmp97_;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp98_ = _tmp88_[_tmp89_];
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp99_ = self->priv->n_used;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					self->priv->n_used = _tmp99_ + 1;
-#line 11867 "scanner.c"
-				}
-			}
-		}
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp103_ = self->priv->parameters;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp104_ = _tmp103_.depth;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp104_ == 8) {
-#line 11877 "scanner.c"
-			SANE_Parameters _tmp105_ = {0};
-			SANE_Frame _tmp106_ = 0;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp105_ = self->priv->parameters;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp106_ = _tmp105_.format;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp102_ = _tmp106_ == SANE_FRAME_GRAY;
-#line 11886 "scanner.c"
-		} else {
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp102_ = FALSE;
-#line 11890 "scanner.c"
-		}
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp102_) {
-#line 11894 "scanner.c"
-			ScanJob* _tmp107_ = NULL;
-			gint _tmp108_ = 0;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp107_ = job;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp108_ = _tmp107_->depth;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp101_ = _tmp108_ == 2;
-#line 11903 "scanner.c"
-		} else {
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp101_ = FALSE;
-#line 11907 "scanner.c"
-		}
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp101_) {
-#line 11911 "scanner.c"
-			ScanJob* _tmp109_ = NULL;
-			ScanMode _tmp110_ = 0;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp109_ = job;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp110_ = _tmp109_->scan_mode;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp100_ = _tmp110_ == SCAN_MODE_GRAY;
-#line 11920 "scanner.c"
-		} else {
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp100_ = FALSE;
-#line 11924 "scanner.c"
-		}
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp100_) {
-#line 11928 "scanner.c"
-			guchar block = '\0';
-			gint write_offset = 0;
-			gint block_shift = 0;
-			ScanLine* _tmp150_ = NULL;
-			ScanLine* _tmp151_ = NULL;
-			gint _tmp152_ = 0;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			block = (guchar) 0;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			write_offset = 0;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			block_shift = 6;
-#line 11941 "scanner.c"
-			{
-				gint i = 0;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				i = 0;
-#line 11946 "scanner.c"
-				{
-					gboolean _tmp111_ = FALSE;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp111_ = TRUE;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					while (TRUE) {
-#line 11953 "scanner.c"
-						gint _tmp113_ = 0;
-						ScanLine* _tmp114_ = NULL;
-						gint _tmp115_ = 0;
-						gint offset = 0;
-						gint _tmp116_ = 0;
-						ScanLine* _tmp117_ = NULL;
-						gint _tmp118_ = 0;
-						gint _tmp143_ = 0;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp111_) {
-#line 11964 "scanner.c"
-							gint _tmp112_ = 0;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp112_ = i;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp112_ + 1;
-#line 11970 "scanner.c"
-						}
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp111_ = FALSE;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp113_ = i;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp114_ = line;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp115_ = _tmp114_->n_lines;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(_tmp113_ < _tmp115_)) {
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							break;
-#line 11984 "scanner.c"
-						}
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp116_ = i;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp117_ = line;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp118_ = _tmp117_->data_length;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						offset = _tmp116_ * _tmp118_;
-#line 11994 "scanner.c"
-						{
-							gint x = 0;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							x = 0;
-#line 11999 "scanner.c"
-							{
-								gboolean _tmp119_ = FALSE;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-								_tmp119_ = TRUE;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-								while (TRUE) {
-#line 12006 "scanner.c"
-									gint _tmp121_ = 0;
-									ScanLine* _tmp122_ = NULL;
-									gint _tmp123_ = 0;
-									guchar p = '\0';
-									ScanLine* _tmp124_ = NULL;
-									guchar* _tmp125_ = NULL;
-									gint _tmp125__length1 = 0;
-									gint _tmp126_ = 0;
-									gint _tmp127_ = 0;
-									guchar _tmp128_ = '\0';
-									guchar sample = '\0';
-									guchar _tmp129_ = '\0';
-									guchar _tmp132_ = '\0';
-									guchar _tmp133_ = '\0';
-									gint _tmp134_ = 0;
-									gint _tmp135_ = 0;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									if (!_tmp119_) {
-#line 12025 "scanner.c"
-										gint _tmp120_ = 0;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp120_ = x;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										x = _tmp120_ + 1;
-#line 12031 "scanner.c"
-									}
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp119_ = FALSE;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp121_ = x;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp122_ = line;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp123_ = _tmp122_->width;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									if (!(_tmp121_ < _tmp123_)) {
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										break;
-#line 12045 "scanner.c"
-									}
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp124_ = line;
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp125_ = _tmp124_->data;
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp125__length1 = _tmp124_->data_length1;
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp126_ = offset;
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp127_ = x;
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp128_ = _tmp125_[_tmp126_ + _tmp127_];
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									p = _tmp128_;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp129_ = p;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									if (((gint) _tmp129_) >= 192) {
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										sample = (guchar) 3;
-#line 12067 "scanner.c"
-									} else {
-										guchar _tmp130_ = '\0';
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp130_ = p;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										if (((gint) _tmp130_) >= 128) {
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-											sample = (guchar) 2;
-#line 12076 "scanner.c"
-										} else {
-											guchar _tmp131_ = '\0';
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-											_tmp131_ = p;
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-											if (((gint) _tmp131_) >= 64) {
-#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-												sample = (guchar) 1;
-#line 12085 "scanner.c"
-											} else {
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-												sample = (guchar) 0;
-#line 12089 "scanner.c"
-											}
-										}
-									}
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp132_ = block;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp133_ = sample;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp134_ = block_shift;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									block = _tmp132_ | (_tmp133_ << _tmp134_);
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp135_ = block_shift;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									if (_tmp135_ == 0) {
-#line 12105 "scanner.c"
-										ScanLine* _tmp136_ = NULL;
-										guchar* _tmp137_ = NULL;
-										gint _tmp137__length1 = 0;
-										gint _tmp138_ = 0;
-										guchar _tmp139_ = '\0';
-										guchar _tmp140_ = '\0';
-										gint _tmp141_ = 0;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp136_ = line;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp137_ = _tmp136_->data;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp137__length1 = _tmp136_->data_length1;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp138_ = write_offset;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp139_ = block;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp137_[_tmp138_] = _tmp139_;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp140_ = _tmp137_[_tmp138_];
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp141_ = write_offset;
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										write_offset = _tmp141_ + 1;
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										block = (guchar) 0;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										block_shift = 6;
-#line 12135 "scanner.c"
-									} else {
-										gint _tmp142_ = 0;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp142_ = block_shift;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										block_shift = _tmp142_ - 2;
-#line 12142 "scanner.c"
-									}
-								}
-							}
-						}
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp143_ = block_shift;
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp143_ != 6) {
-#line 12151 "scanner.c"
-							ScanLine* _tmp144_ = NULL;
-							guchar* _tmp145_ = NULL;
-							gint _tmp145__length1 = 0;
-							gint _tmp146_ = 0;
-							guchar _tmp147_ = '\0';
-							guchar _tmp148_ = '\0';
-							gint _tmp149_ = 0;
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp144_ = line;
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp145_ = _tmp144_->data;
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp145__length1 = _tmp144_->data_length1;
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp146_ = write_offset;
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp147_ = block;
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp145_[_tmp146_] = _tmp147_;
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp148_ = _tmp145_[_tmp146_];
-#line 1428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp149_ = write_offset;
-#line 1428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							write_offset = _tmp149_ + 1;
-#line 1429 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							block = (guchar) 0;
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							block_shift = 6;
-#line 12181 "scanner.c"
-						}
-					}
-				}
-			}
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp150_ = line;
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp151_ = line;
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp152_ = _tmp151_->width;
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp150_->data_length = ((_tmp152_ * 2) + 7) / 8;
-#line 12194 "scanner.c"
-		}
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp153_ = job;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp154_ = _tmp153_->id;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp155_ = line;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp156_ = notify_got_line_new (_tmp154_, _tmp155_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp157_ = _tmp156_;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_notify (self, (Notify*) _tmp157_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_notify_unref0 (_tmp157_);
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_scan_line_unref0 (line);
-#line 12212 "scanner.c"
-	}
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_scan_job_unref0 (job);
-#line 12216 "scanner.c"
-}
-
-
-static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_authorization_cb (resource, username, -1, password, -1);
-#line 12223 "scanner.c"
-}
-
-
-static void* scanner_scan_thread (Scanner* self) {
-	void* result = NULL;
-	SANE_Int version_code = {0};
-	SANE_Status status = 0;
-	SANE_Int _tmp0_ = {0};
-	SANE_Status _tmp1_ = 0;
-	SANE_Status _tmp2_ = 0;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	SANE_Status _tmp5_ = 0;
-	SANE_Int _tmp8_ = {0};
-	gint _tmp9_ = 0;
-	SANE_Int _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	SANE_Int _tmp12_ = {0};
-	gint _tmp13_ = 0;
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->state = SCAN_STATE_IDLE;
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = sane_init (&_tmp0_, _scanner_authorization_cb_sane_authcallback);
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	version_code = _tmp0_;
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp1_;
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = status;
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = sane_status_to_string (_tmp2_);
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = _tmp3_;
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1447: sane_init () -> %s", _tmp4_);
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp4_);
-#line 1448 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = status;
-#line 1448 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 12267 "scanner.c"
-		SANE_Status _tmp6_ = 0;
-		const gchar* _tmp7_ = NULL;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp6_ = status;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp7_ = sane_strstatus (_tmp6_);
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1450: Unable to initialize SANE backend: %s", _tmp7_);
-#line 1451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		result = NULL;
-#line 1451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return result;
-#line 12280 "scanner.c"
-	}
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp8_ = version_code;
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp9_ = SANE_VERSION_MAJOR (_tmp8_);
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp10_ = version_code;
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp11_ = SANE_VERSION_MINOR (_tmp10_);
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp12_ = version_code;
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp13_ = SANE_VERSION_BUILD (_tmp12_);
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1453: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
-#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_redetect (self);
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	while (TRUE) {
-#line 12300 "scanner.c"
-		gboolean _tmp14_ = FALSE;
-		ScanState _tmp15_ = 0;
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = scanner_handle_requests (self);
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (!_tmp14_) {
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 12309 "scanner.c"
-		}
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp15_ = self->priv->state;
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		switch (_tmp15_) {
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SCAN_STATE_IDLE:
-#line 12317 "scanner.c"
-			{
-				GList* _tmp16_ = NULL;
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp16_ = self->priv->job_queue;
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp16_ != NULL) {
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_scanning (self, TRUE);
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					self->priv->state = SCAN_STATE_OPEN;
-#line 12328 "scanner.c"
-				}
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 12332 "scanner.c"
-			}
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SCAN_STATE_REDETECT:
-#line 12336 "scanner.c"
-			{
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_redetect (self);
-#line 1474 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 12342 "scanner.c"
-			}
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SCAN_STATE_OPEN:
-#line 12346 "scanner.c"
-			{
-#line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_open (self);
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 12352 "scanner.c"
-			}
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SCAN_STATE_GET_OPTION:
-#line 12356 "scanner.c"
-			{
-#line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_get_option (self);
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 12362 "scanner.c"
-			}
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SCAN_STATE_START:
-#line 12366 "scanner.c"
-			{
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_start (self);
-#line 1483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 12372 "scanner.c"
-			}
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SCAN_STATE_GET_PARAMETERS:
-#line 12376 "scanner.c"
-			{
-#line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_get_parameters (self);
-#line 1486 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 12382 "scanner.c"
-			}
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			case SCAN_STATE_READ:
-#line 12386 "scanner.c"
-			{
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_do_read (self);
-#line 1489 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				break;
-#line 12392 "scanner.c"
-			}
-			default:
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			break;
-#line 12397 "scanner.c"
-		}
-	}
-#line 1493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	result = NULL;
-#line 1493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return result;
-#line 12404 "scanner.c"
-}
-
-
-static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
-	gpointer result;
-	result = scanner_scan_thread ((Scanner*) self);
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_unref (self);
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return result;
-#line 12415 "scanner.c"
-}
-
-
-void scanner_start (Scanner* self) {
-	GError * _inner_error_ = NULL;
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 12423 "scanner.c"
-	{
-		GThread* _tmp0_ = NULL;
-		GThread* _tmp1_ = NULL;
-		GThread* _tmp2_ = NULL;
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp1_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = _tmp1_;
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12434 "scanner.c"
-			goto __catch16_g_error;
-		}
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp2_ = _tmp0_;
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = NULL;
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_thread_unref0 (self->priv->thread);
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->thread = _tmp2_;
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_thread_unref0 (_tmp0_);
-#line 12447 "scanner.c"
-	}
-	goto __finally16;
-	__catch16_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		e = _inner_error_;
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_inner_error_ = NULL;
-#line 1504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp3_ = e;
-#line 1504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp4_ = _tmp3_->message;
-#line 1504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_critical ("scanner.vala:1504: Unable to create thread: %s", _tmp4_);
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_error_free0 (e);
-#line 12467 "scanner.c"
-	}
-	__finally16:
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1498 "/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 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_clear_error (&_inner_error_);
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 12478 "scanner.c"
-	}
-}
-
-
-void scanner_redetect (Scanner* self) {
-	gboolean _tmp0_ = FALSE;
-	GAsyncQueue* _tmp1_ = NULL;
-	RequestRedetect* _tmp2_ = NULL;
-#line 1508 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->need_redetect;
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp0_) {
-#line 1511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		return;
-#line 12495 "scanner.c"
-	}
-#line 1512 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->need_redetect = TRUE;
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1514: Requesting redetection of scan devices");
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = self->priv->request_queue;
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = request_redetect_new ();
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12507 "scanner.c"
-}
-
-
-gboolean scanner_is_scanning (Scanner* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->scanning;
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	result = _tmp0_;
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return result;
-#line 12522 "scanner.c"
-}
-
-
-static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
-	gchar* result = NULL;
-	ScanMode _tmp0_ = 0;
-#line 1524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = mode;
-#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	switch (_tmp0_) {
-#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SCAN_MODE_DEFAULT:
-#line 12537 "scanner.c"
-		{
-			gchar* _tmp1_ = NULL;
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp1_ = g_strdup ("ScanMode.DEFAULT");
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp1_;
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12546 "scanner.c"
-		}
-#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SCAN_MODE_COLOR:
-#line 12550 "scanner.c"
-		{
-			gchar* _tmp2_ = NULL;
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp2_ = g_strdup ("ScanMode.COLOR");
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp2_;
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12559 "scanner.c"
-		}
-#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SCAN_MODE_GRAY:
-#line 12563 "scanner.c"
-		{
-			gchar* _tmp3_ = NULL;
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp3_ = g_strdup ("ScanMode.GRAY");
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp3_;
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12572 "scanner.c"
-		}
-#line 1526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SCAN_MODE_LINEART:
-#line 12576 "scanner.c"
-		{
-			gchar* _tmp4_ = NULL;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp4_ = g_strdup ("ScanMode.LINEART");
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp4_;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12585 "scanner.c"
-		}
-		default:
-		{
-			ScanMode _tmp5_ = 0;
-			gchar* _tmp6_ = NULL;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp5_ = mode;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp6_;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12599 "scanner.c"
-		}
-	}
-}
-
-
-static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
-	gchar* result = NULL;
-	ScanType _tmp0_ = 0;
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = type;
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	switch (_tmp0_) {
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SCAN_TYPE_SINGLE:
-#line 12616 "scanner.c"
-		{
-			gchar* _tmp1_ = NULL;
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp1_ = g_strdup ("ScanType.SINGLE");
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp1_;
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12625 "scanner.c"
-		}
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SCAN_TYPE_ADF_FRONT:
-#line 12629 "scanner.c"
-		{
-			gchar* _tmp2_ = NULL;
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp2_ = g_strdup ("ScanType.ADF_FRONT");
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp2_;
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12638 "scanner.c"
-		}
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SCAN_TYPE_ADF_BACK:
-#line 12642 "scanner.c"
-		{
-			gchar* _tmp3_ = NULL;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp3_ = g_strdup ("ScanType.ADF_BACK");
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp3_;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12651 "scanner.c"
-		}
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		case SCAN_TYPE_ADF_BOTH:
-#line 12655 "scanner.c"
-		{
-			gchar* _tmp4_ = NULL;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp4_ = g_strdup ("ScanType.ADF_BOTH");
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp4_;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12664 "scanner.c"
-		}
-		default:
-		{
-			ScanType _tmp5_ = 0;
-			gchar* _tmp6_ = NULL;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp5_ = type;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			result = _tmp6_;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			return result;
-#line 12678 "scanner.c"
-		}
-	}
-}
-
-
-void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	ScanOptions* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	ScanOptions* _tmp5_ = NULL;
-	ScanMode _tmp6_ = 0;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	ScanOptions* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	ScanOptions* _tmp11_ = NULL;
-	ScanType _tmp12_ = 0;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	ScanOptions* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	ScanOptions* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	ScanOptions* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	ScanOptions* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	RequestStartScan* request = NULL;
-	RequestStartScan* _tmp23_ = NULL;
-	ScanJob* _tmp24_ = NULL;
-	ScanJob* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	ScanJob* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	ScanJob* _tmp30_ = NULL;
-	ScanOptions* _tmp31_ = NULL;
-	gint _tmp32_ = 0;
-	ScanJob* _tmp33_ = NULL;
-	ScanOptions* _tmp34_ = NULL;
-	ScanMode _tmp35_ = 0;
-	ScanJob* _tmp36_ = NULL;
-	ScanOptions* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	ScanJob* _tmp39_ = NULL;
-	ScanOptions* _tmp40_ = NULL;
-	ScanType _tmp41_ = 0;
-	ScanJob* _tmp42_ = NULL;
-	ScanOptions* _tmp43_ = NULL;
-	gint _tmp44_ = 0;
-	ScanJob* _tmp45_ = NULL;
-	ScanOptions* _tmp46_ = NULL;
-	gint _tmp47_ = 0;
-	ScanJob* _tmp48_ = NULL;
-	ScanOptions* _tmp49_ = NULL;
-	gint _tmp50_ = 0;
-	ScanJob* _tmp51_ = NULL;
-	ScanOptions* _tmp52_ = NULL;
-	gint _tmp53_ = 0;
-	GAsyncQueue* _tmp54_ = NULL;
-	Request* _tmp55_ = NULL;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (options != NULL);
-#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = device;
-#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp1_ != NULL) {
-#line 12749 "scanner.c"
-		const gchar* _tmp2_ = NULL;
-#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp2_ = device;
-#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = _tmp2_;
-#line 12755 "scanner.c"
-	} else {
-#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = "(null)";
-#line 12759 "scanner.c"
-	}
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = options;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = _tmp3_->dpi;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = options;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = _tmp5_->scan_mode;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = scanner_get_scan_mode_string (self, _tmp6_);
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp8_ = _tmp7_;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp9_ = options;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp10_ = _tmp9_->depth;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp11_ = options;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp12_ = _tmp11_->type;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp13_ = scanner_get_scan_type_string (self, _tmp12_);
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp14_ = _tmp13_;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp15_ = options;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp16_ = _tmp15_->paper_width;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp17_ = options;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp18_ = _tmp17_->paper_height;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp19_ = options;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp20_ = _tmp19_->brightness;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp21_ = options;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp22_ = _tmp21_->contrast;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1560: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
-"d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%" \
-"d)", _tmp0_, _tmp4_, _tmp8_, _tmp10_, _tmp14_, _tmp16_, _tmp18_, _tmp20_, _tmp22_);
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp14_);
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp8_);
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp23_ = request_start_scan_new ();
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	request = _tmp23_;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp24_ = scan_job_new ();
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_scan_job_unref0 (request->job);
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	request->job = _tmp24_;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_ = request->job;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26_ = self->job_id;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->job_id = _tmp26_ + 1;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_->id = _tmp26_;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_ = request->job;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28_ = device;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp29_ = g_strdup (_tmp28_);
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp27_->device);
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_->device = _tmp29_;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_ = request->job;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp31_ = options;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp32_ = _tmp31_->dpi;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_->dpi = (gdouble) _tmp32_;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_ = request->job;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp34_ = options;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp35_ = _tmp34_->scan_mode;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_->scan_mode = _tmp35_;
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_ = request->job;
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp37_ = options;
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp38_ = _tmp37_->depth;
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_->depth = _tmp38_;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp39_ = request->job;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp40_ = options;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp41_ = _tmp40_->type;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp39_->type = _tmp41_;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_ = request->job;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = options;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp44_ = _tmp43_->paper_width;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_->page_width = _tmp44_;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp45_ = request->job;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp46_ = options;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp47_ = _tmp46_->paper_height;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp45_->page_height = _tmp47_;
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_ = request->job;
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = options;
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = _tmp49_->brightness;
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_->brightness = _tmp50_;
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = request->job;
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_ = options;
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp53_ = _tmp52_->contrast;
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_->contrast = _tmp53_;
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp54_ = self->priv->request_queue;
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp55_ = _request_ref0 ((Request*) request);
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_async_queue_push (_tmp54_, _tmp55_);
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_request_unref0 (request);
-#line 12907 "scanner.c"
-}
-
-
-void scanner_cancel (Scanner* self) {
-	gint _tmp0_ = 0;
-	GAsyncQueue* _tmp1_ = NULL;
-	RequestCancel* _tmp2_ = NULL;
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->job_id;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->first_job_id = _tmp0_;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = self->priv->request_queue;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = request_cancel_new ();
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12927 "scanner.c"
-}
-
-
-static gpointer _g_thread_ref0 (gpointer self) {
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return self ? g_thread_ref (self) : NULL;
-#line 12934 "scanner.c"
-}
-
-
-void scanner_free (Scanner* self) {
-	GAsyncQueue* _tmp0_ = NULL;
-	RequestQuit* _tmp1_ = NULL;
-	GThread* _tmp2_ = NULL;
-#line 1585 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_return_if_fail (self != NULL);
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1587: Stopping scan thread");
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp0_ = self->priv->request_queue;
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp1_ = request_quit_new ();
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_async_queue_push (_tmp0_, (Request*) _tmp1_);
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp2_ = self->priv->thread;
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp2_ != NULL) {
-#line 12956 "scanner.c"
-		GThread* _tmp3_ = NULL;
-		GThread* _tmp4_ = NULL;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp3_ = self->priv->thread;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp4_ = _g_thread_ref0 (_tmp3_);
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_thread_join (_tmp4_);
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_thread_unref0 (self->priv->thread);
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->thread = NULL;
-#line 12969 "scanner.c"
-	}
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	sane_exit ();
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1598: sane_exit ()");
-#line 12975 "scanner.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-	typedef void (*GMarshalFunc_VOID__SCAN_PAGE_INFO) (gpointer data1, gpointer arg_1, gpointer data2);
-	register GMarshalFunc_VOID__SCAN_PAGE_INFO callback;
-	register GCClosure * cc;
-	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 12994 "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 13000 "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 13006 "scanner.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-	typedef void (*GMarshalFunc_VOID__SCAN_LINE) (gpointer data1, gpointer arg_1, gpointer data2);
-	register GMarshalFunc_VOID__SCAN_LINE callback;
-	register GCClosure * cc;
-	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 13025 "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 13031 "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 13037 "scanner.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-	typedef void (*GMarshalFunc_VOID__INT_STRING) (gpointer data1, gint arg_1, const char* arg_2, gpointer data2);
-	register GMarshalFunc_VOID__INT_STRING callback;
-	register GCClosure * cc;
-	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 13056 "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 13062 "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 13068 "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 13075 "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 13084 "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 13094 "scanner.c"
-	} else {
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 13098 "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 13106 "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 13113 "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 13120 "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 13124 "scanner.c"
-		}
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = scanner_ref (object);
-#line 13128 "scanner.c"
-	} else {
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 13132 "scanner.c"
-	}
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 13136 "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 13147 "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 13153 "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 13157 "scanner.c"
-	} else {
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		*object_p = scanner_ref (value->data[0].v_pointer);
-#line 13161 "scanner.c"
-	}
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	return NULL;
-#line 13165 "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 13179 "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 13188 "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 13208 "scanner.c"
-	} else {
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 13212 "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 13218 "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 13237 "scanner.c"
-	} else {
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		value->data[0].v_pointer = NULL;
-#line 13241 "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 13247 "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"
-	((ScannerClass *) 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 13277 "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 13286 "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 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_signal_handlers_destroy (self);
-#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 13314 "scanner.c"
-}
-
-
-GType scanner_get_type (void) {
-	static volatile gsize scanner_type_id__volatile = 0;
-	if (g_once_init_enter (&scanner_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_scanner_init, value_scanner_free_value, value_scanner_copy_value, value_scanner_peek_pointer, "p", value_scanner_collect_value, "p", value_scanner_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (ScannerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) scanner_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Scanner), 0, (GInstanceInitFunc) scanner_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 scanner_type_id;
-		scanner_type_id = g_type_register_fundamental (g_type_fundamental_next (), "Scanner", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&scanner_type_id__volatile, scanner_type_id);
-	}
-	return scanner_type_id__volatile;
-}
-
-
-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 13339 "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 13352 "scanner.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);
-}
-
-
-static gint _vala_array_length (gpointer array) {
-	int length;
-	length = 0;
-	if (array) {
-		while (((gpointer*) array)[length]) {
-			length++;
-		}
-	}
-	return length;
-}
-
-
-
diff --git a/src/scanner.vala b/src/scanner.vala
index 16f33cf..f98b4b6 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -69,7 +69,8 @@ public enum ScanType
     SINGLE,
     ADF_FRONT,
     ADF_BACK,
-    ADF_BOTH
+    ADF_BOTH,
+    BATCH
 }
 
 public class ScanOptions
@@ -82,6 +83,7 @@ public class ScanOptions
     public int paper_height;
     public int brightness;
     public int contrast;
+    public int page_delay;
 }
 
 private class ScanJob
@@ -96,6 +98,7 @@ private class ScanJob
     public int page_height;
     public int brightness;
     public int contrast;
+    public int page_delay;
 }
 
 private class Request {}
@@ -945,6 +948,7 @@ public class Scanner
                 switch (job.type)
                 {
                 case ScanType.SINGLE:
+                case ScanType.BATCH:
                     if (!set_default_option (handle, option, index))
                         if (!set_constrained_string_option (handle, option, index, flatbed_sources, null))
                             warning ("Unable to set single page source, please file a bug");
@@ -1040,7 +1044,7 @@ public class Scanner
             if (option != null)
             {
                 if (option.type == Sane.ValueType.BOOL)
-                    set_bool_option (handle, option, index, job.type != ScanType.SINGLE, null);
+                    set_bool_option (handle, option, index, (job.type != ScanType.SINGLE) && (job.type != ScanType.BATCH), null);
             }
 
             /* Disable compression, we will compress after scanning */
@@ -1291,6 +1295,9 @@ public class Scanner
         /* Go back for another page */
         if (job.type != ScanType.SINGLE)
         {
+            if (job.type == ScanType.BATCH)
+                Thread.usleep (job.page_delay * 1000);
+
             page_number++;
             pass_number = 0;
             notify (new NotifyPageDone (job.id));
@@ -1550,6 +1557,8 @@ public class Scanner
             return "ScanType.ADF_BACK";
         case ScanType.ADF_BOTH:
             return "ScanType.ADF_BOTH";
+        case ScanType.BATCH:
+            return "ScanType.BATCH";
         default:
             return "%d".printf (type);
         }
@@ -1557,10 +1566,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, brightness=%d, contrast=%d)",
+        debug ("Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%d, delay=%dms)",
                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,
-               options.brightness, options.contrast);
+               options.brightness, options.contrast, options.page_delay);
         var request = new RequestStartScan ();
         request.job = new ScanJob ();
         request.job.id = job_id++;
@@ -1573,6 +1582,7 @@ public class Scanner
         request.job.page_height = options.paper_height;
         request.job.brightness = options.brightness;
         request.job.contrast = options.contrast;
+        request.job.page_delay = options.page_delay;
         request_queue.push (request);
     }
 
diff --git a/src/screensaver.vala b/src/screensaver.vala
new file mode 100644
index 0000000..ef2dfb8
--- /dev/null
+++ b/src/screensaver.vala
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2017 Stéphane Fillion
+ * Authors: Stéphane Fillion <stphanef3724@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 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.
+ */
+
+[DBus (name = "org.freedesktop.ScreenSaver")]
+public interface FreedesktopScreensaver : Object
+{
+    public static FreedesktopScreensaver get_proxy () throws IOError
+    {
+        return Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver");
+    }
+
+    [DBus (name = "Inhibit")]
+    public abstract uint32 inhibit (string application_name, string reason_for_inhibit) throws IOError;
+
+    [DBus (name = "UnInhibit")]
+    public abstract void uninhibit (uint32 cookie) throws IOError;
+}
diff --git a/src/simple-scan.c b/src/simple-scan.c
deleted file mode 100644
index 9b84313..0000000
--- a/src/simple-scan.c
+++ /dev/null
@@ -1,4276 +0,0 @@
-/* simple-scan.c generated by valac 0.34.6, the Vala compiler
- * generated from simple-scan.vala, do not modify */
-
-/*
- * Copyright (C) 2009-2015 Canonical Ltd.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 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.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-#include <gusb.h>
-#include <gio/gio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include "colord.h"
-#include <float.h>
-#include <math.h>
-#include "sane/sane.h"
-#include <glib/gi18n-lib.h>
-#include <glib/gstdio.h>
-#include <unistd.h>
-#include <locale.h>
-
-
-#define TYPE_SIMPLE_SCAN (simple_scan_get_type ())
-#define SIMPLE_SCAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SIMPLE_SCAN, SimpleScan))
-#define SIMPLE_SCAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SIMPLE_SCAN, SimpleScanClass))
-#define IS_SIMPLE_SCAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SIMPLE_SCAN))
-#define IS_SIMPLE_SCAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SIMPLE_SCAN))
-#define SIMPLE_SCAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SIMPLE_SCAN, SimpleScanClass))
-
-typedef struct _SimpleScan SimpleScan;
-typedef struct _SimpleScanClass SimpleScanClass;
-typedef struct _SimpleScanPrivate SimpleScanPrivate;
-
-#define TYPE_SCAN_DEVICE (scan_device_get_type ())
-#define SCAN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_DEVICE, ScanDevice))
-#define SCAN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_DEVICE, ScanDeviceClass))
-#define IS_SCAN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_DEVICE))
-#define IS_SCAN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_DEVICE))
-#define SCAN_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_DEVICE, ScanDeviceClass))
-
-typedef struct _ScanDevice ScanDevice;
-typedef struct _ScanDeviceClass ScanDeviceClass;
-
-#define TYPE_USER_INTERFACE (user_interface_get_type ())
-#define USER_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_USER_INTERFACE, UserInterface))
-#define USER_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_USER_INTERFACE, UserInterfaceClass))
-#define IS_USER_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_USER_INTERFACE))
-#define IS_USER_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_USER_INTERFACE))
-#define USER_INTERFACE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_USER_INTERFACE, UserInterfaceClass))
-
-typedef struct _UserInterface UserInterface;
-typedef struct _UserInterfaceClass UserInterfaceClass;
-
-#define TYPE_SCANNER (scanner_get_type ())
-#define SCANNER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCANNER, Scanner))
-#define SCANNER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCANNER, ScannerClass))
-#define IS_SCANNER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCANNER))
-#define IS_SCANNER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCANNER))
-#define SCANNER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCANNER, ScannerClass))
-
-typedef struct _Scanner Scanner;
-typedef struct _ScannerClass ScannerClass;
-
-#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 _scan_device_unref0(var) ((var == NULL) ? NULL : (var = (scan_device_unref (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _scanner_unref0(var) ((var == NULL) ? NULL : (var = (scanner_unref (var), NULL)))
-#define _book_unref0(var) ((var == NULL) ? NULL : (var = (book_unref (var), NULL)))
-
-#define TYPE_SCAN_OPTIONS (scan_options_get_type ())
-#define SCAN_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_OPTIONS, ScanOptions))
-#define SCAN_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_OPTIONS, ScanOptionsClass))
-#define IS_SCAN_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_OPTIONS))
-#define IS_SCAN_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_OPTIONS))
-#define SCAN_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_OPTIONS, ScanOptionsClass))
-
-typedef struct _ScanOptions ScanOptions;
-typedef struct _ScanOptionsClass ScanOptionsClass;
-
-#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;
-
-#define TYPE_SCAN_LINE (scan_line_get_type ())
-#define SCAN_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_LINE, ScanLine))
-#define SCAN_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_LINE, ScanLineClass))
-#define IS_SCAN_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_LINE))
-#define IS_SCAN_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_LINE))
-#define SCAN_LINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_LINE, ScanLineClass))
-
-typedef struct _ScanLine ScanLine;
-typedef struct _ScanLineClass ScanLineClass;
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-typedef struct _ScanDevicePrivate ScanDevicePrivate;
-#define __g_list_free__scan_device_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__scan_device_unref0_ (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
-#define _g_ptr_array_unref0(var) ((var == NULL) ? NULL : (var = (g_ptr_array_unref (var), NULL)))
-#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
-
-#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 TYPE_SCAN_DIRECTION (scan_direction_get_type ())
-#define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
-typedef struct _ScanPageInfoPrivate ScanPageInfoPrivate;
-typedef struct _ScanOptionsPrivate ScanOptionsPrivate;
-
-#define TYPE_SCAN_MODE (scan_mode_get_type ())
-
-#define TYPE_SCAN_TYPE (scan_type_get_type ())
-#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
-#define _fclose0(var) ((var == NULL) ? NULL : (var = (fclose (var), NULL)))
-#define _g_option_context_free0(var) ((var == NULL) ? NULL : (var = (g_option_context_free (var), NULL)))
-#define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL)))
-
-struct _SimpleScan {
-	GtkApplication parent_instance;
-	SimpleScanPrivate * priv;
-};
-
-struct _SimpleScanClass {
-	GtkApplicationClass parent_class;
-};
-
-struct _SimpleScanPrivate {
-	ScanDevice* default_device;
-	gboolean have_devices;
-	GUsbContext* usb_context;
-	UserInterface* ui;
-	Scanner* scanner;
-	Book* book;
-};
-
-struct _ScanDevice {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanDevicePrivate * priv;
-	gchar* name;
-	gchar* label;
-};
-
-struct _ScanDeviceClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanDevice *self);
-};
-
-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);
-};
-
-typedef enum  {
-	SCAN_MODE_DEFAULT,
-	SCAN_MODE_COLOR,
-	SCAN_MODE_GRAY,
-	SCAN_MODE_LINEART
-} ScanMode;
-
-typedef enum  {
-	SCAN_TYPE_SINGLE,
-	SCAN_TYPE_ADF_FRONT,
-	SCAN_TYPE_ADF_BACK,
-	SCAN_TYPE_ADF_BOTH
-} ScanType;
-
-struct _ScanOptions {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanOptionsPrivate * priv;
-	gint dpi;
-	ScanMode scan_mode;
-	gint depth;
-	ScanType type;
-	gint paper_width;
-	gint paper_height;
-	gint brightness;
-	gint contrast;
-};
-
-struct _ScanOptionsClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanOptions *self);
-};
-
-
-static gpointer simple_scan_parent_class = NULL;
-static gboolean simple_scan_show_version;
-static gboolean simple_scan_show_version = FALSE;
-static gboolean simple_scan_debug_enabled;
-static gboolean simple_scan_debug_enabled = FALSE;
-static gchar* simple_scan_fix_pdf_filename;
-static gchar* simple_scan_fix_pdf_filename = NULL;
-static GTimer* simple_scan_log_timer;
-static GTimer* simple_scan_log_timer = NULL;
-static FILE* simple_scan_log_file;
-static FILE* simple_scan_log_file = NULL;
-
-GType simple_scan_get_type (void) G_GNUC_CONST;
-gpointer scan_device_ref (gpointer instance);
-void scan_device_unref (gpointer instance);
-GParamSpec* param_spec_scan_device (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scan_device (GValue* value, gpointer v_object);
-void value_take_scan_device (GValue* value, gpointer v_object);
-gpointer value_get_scan_device (const GValue* value);
-GType scan_device_get_type (void) G_GNUC_CONST;
-GType user_interface_get_type (void) G_GNUC_CONST;
-gpointer scanner_ref (gpointer instance);
-void scanner_unref (gpointer instance);
-GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scanner (GValue* value, gpointer v_object);
-void value_take_scanner (GValue* value, gpointer v_object);
-gpointer value_get_scanner (const GValue* value);
-GType scanner_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;
-#define SIMPLE_SCAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SIMPLE_SCAN, SimpleScanPrivate))
-enum  {
-	SIMPLE_SCAN_DUMMY_PROPERTY
-};
-SimpleScan* simple_scan_new (ScanDevice* device);
-SimpleScan* simple_scan_construct (GType object_type, ScanDevice* device);
-static void simple_scan_real_startup (GApplication* base);
-UserInterface* user_interface_new (void);
-UserInterface* user_interface_construct (GType object_type);
-Book* user_interface_get_book (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);
-void value_set_scan_options (GValue* value, gpointer v_object);
-void value_take_scan_options (GValue* value, gpointer v_object);
-gpointer value_get_scan_options (const GValue* value);
-GType scan_options_get_type (void) G_GNUC_CONST;
-static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gchar* device, ScanOptions* options);
-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, 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);
-static void simple_scan_authorize_cb (SimpleScan* self, Scanner* scanner, const gchar* resource);
-static void _simple_scan_authorize_cb_scanner_request_authorization (Scanner* _sender, const gchar* resource, gpointer self);
-static void simple_scan_scanner_new_page_cb (SimpleScan* self, Scanner* scanner);
-static void _simple_scan_scanner_new_page_cb_scanner_expect_page (Scanner* _sender, gpointer self);
-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;
-static void simple_scan_scanner_page_info_cb (SimpleScan* self, Scanner* scanner, ScanPageInfo* info);
-static void _simple_scan_scanner_page_info_cb_scanner_got_page_info (Scanner* _sender, ScanPageInfo* info, gpointer self);
-gpointer scan_line_ref (gpointer instance);
-void scan_line_unref (gpointer instance);
-GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scan_line (GValue* value, gpointer v_object);
-void value_take_scan_line (GValue* value, gpointer v_object);
-gpointer value_get_scan_line (const GValue* value);
-GType scan_line_get_type (void) G_GNUC_CONST;
-static void simple_scan_scanner_line_cb (SimpleScan* self, Scanner* scanner, ScanLine* line);
-static void _simple_scan_scanner_line_cb_scanner_got_line (Scanner* _sender, ScanLine* line, gpointer self);
-static void simple_scan_scanner_page_done_cb (SimpleScan* self, Scanner* scanner);
-static void _simple_scan_scanner_page_done_cb_scanner_page_done (Scanner* _sender, gpointer self);
-static void simple_scan_scanner_document_done_cb (SimpleScan* self, Scanner* scanner);
-static void _simple_scan_scanner_document_done_cb_scanner_document_done (Scanner* _sender, gpointer self);
-static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, gint error_code, const gchar* error_string);
-static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self);
-static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner* scanner);
-static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self);
-static void ___lambda22_ (SimpleScan* self);
-void scanner_redetect (Scanner* self);
-static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self);
-static void ___lambda23_ (SimpleScan* self);
-static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self);
-void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gchar* missing_driver);
-void user_interface_set_selected_device (UserInterface* self, const gchar* value);
-static void _scan_device_unref0_ (gpointer var);
-static void _g_list_free__scan_device_unref0_ (GList* self);
-static void simple_scan_real_activate (GApplication* base);
-void user_interface_start (UserInterface* self);
-void scanner_start (Scanner* self);
-static void simple_scan_real_shutdown (GApplication* base);
-void scanner_free (Scanner* self);
-gchar* simple_scan_suggest_driver (SimpleScan* self);
-static void _g_free0_ (gpointer var);
-static void simple_scan_add_devices (SimpleScan* self, GHashTable* map, guint32* devices, int devices_length1, const gchar* driver);
-void user_interface_authorize (UserInterface* self, const gchar* resource, gchar** username, gchar** password);
-void scanner_authorize (Scanner* self, const gchar* username, const gchar* password);
-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;
-static Page* simple_scan_append_page (SimpleScan* self);
-Page* book_get_page (Book* self, gint page_number);
-gboolean page_get_has_data (Page* self);
-void user_interface_set_selected_page (UserInterface* self, Page* value);
-void page_start (Page* self);
-GType scan_direction_get_type (void) G_GNUC_CONST;
-ScanDirection page_get_scan_direction (Page* self);
-gint page_get_width (Page* self);
-gint page_get_height (Page* self);
-gint page_get_dpi (Page* self);
-gboolean page_get_has_crop (Page* self);
-const gchar* page_get_crop_name (Page* self);
-gint page_get_crop_x (Page* self);
-gint page_get_crop_y (Page* self);
-gint page_get_crop_width (Page* self);
-gint page_get_crop_height (Page* self);
-Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction);
-Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction);
-void book_append_page (Book* self, Page* page);
-void page_set_named_crop (Page* self, const gchar* name);
-void page_set_custom_crop (Page* self, gint width, gint height);
-void page_move_crop (Page* self, gint x, gint y);
-static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar* device_name);
-void page_set_page_info (Page* self, ScanPageInfo* info);
-void page_set_color_profile (Page* self, const gchar* value);
-guint book_get_n_pages (Book* self);
-void page_parse_scan_line (Page* self, ScanLine* line);
-void page_finish (Page* self);
-static void simple_scan_remove_empty_page (SimpleScan* self);
-void book_delete_page (Book* self, Page* page);
-void user_interface_show_error (UserInterface* self, const gchar* error_title, const gchar* error_text, gboolean change_scanner_hint);
-gboolean scanner_is_scanning (Scanner* self);
-void user_interface_set_scanning (UserInterface* self, gboolean value);
-GType scan_mode_get_type (void) G_GNUC_CONST;
-GType scan_type_get_type (void) G_GNUC_CONST;
-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, gint quality, GFile* file, GError** error);
-void user_interface_hide_progress_dialog (UserInterface* self);
-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);
-static void simple_scan_fix_pdf (const gchar* filename, GError** error);
-gint simple_scan_main (gchar** args, int args_length1);
-ScanDevice* scan_device_new (void);
-ScanDevice* scan_device_construct (GType object_type);
-static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self);
-static void simple_scan_finalize (GObject* obj);
-
-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 const guint32 SIMPLE_SCAN_brscan_devices[56] = {(guint32) 0x04f90110, (guint32) 0x04f90111, (guint32) 0x04f90112, (guint32) 0x04f9011d, (guint32) 0x04f9011e, (guint32) 0x04f9011f, (guint32) 0x04f9012b, (guint32) 0x04f90124, (guint32) 0x04f90153, (guint32) 0x04f90125, (guint32) 0x04f90113, (guint32) 0x04f90114, (guint32) 0x04f90115, (guint32) 0x04f90116, (guint32) 0x04f90119, (guint32) 0x04f9011a, (guint32) 0x04f9011b, (guint32) 0x04f9011c, (guint32) 0x04f9012e, (guint32) 0x04f9012f, (guint32) 0x04f90130, (guint32) 0x04f90128, (guint32) 0x04f90127, (guint32) 0x04f90142, (guint32) 0x04f90143, (guint32) 0x04f90140, (guint32) 0x04f90141, (guint32) 0x04f9014e, (guint32) 0x04f9014f, (guint32) 0x04f90150, (guint32) 0x04f90151, (guint32) 0x04f9010e, (guint32) 0x04f9013a, (guint32) 0x04f90120, (guint32) 0x04f9010f, (guint32) 0x04f90121, (guint32) 0x04f90122, (guint32) 0x04f90132, (guint32) 0x04f9013d, (guint32) 0x04f9013c, (guint32) 0x04f90136, (guint32) 0x04f90135, (guint32) 0x04f9013e, (guint32) 0x04f9013f, (guint32) 0x04f90144, (guint32) 0x04f90146, (guint32) 0x04f90148, (guint32) 0x04f9014a, (guint32) 0x04f9014b, (guint32) 0x04f9014c, (guint32) 0x04f90157, (guint32) 0x04f90158, (guint32) 0x04f9015d, (guint32) 0x04f9015e, (guint32) 0x04f9015f, (guint32) 0x04f90160};
-static const guint32 SIMPLE_SCAN_brscan2_devices[31] = {(guint32) 0x04f901c9, (guint32) 0x04f901ca, (guint32) 0x04f901cb, (guint32) 0x04f901cc, (guint32) 0x04f901ec, (guint32) 0x04f901e4, (guint32) 0x04f901e3, (guint32) 0x04f901e2, (guint32) 0x04f901e1, (guint32) 0x04f901e0, (guint32) 0x04f901df, (guint32) 0x04f901de, (guint32) 0x04f901dd, (guint32) 0x04f901dc, (guint32) 0x04f901db, (guint32) 0x04f901da, (guint32) 0x04f901d9, (guint32) 0x04f901d8, (guint32) 0x04f901d7, (guint32) 0x04f901d6, (guint32) 0x04f901d5, (guint32) 0x04f901d4, (guint32) 0x04f901d3, (guint32) 0x04f901d2, (guint32) 0x04f901d1, (guint32) 0x04f901d0, (guint32) 0x04f901cf, (guint32) 0x04f901ce, (guint32) 0x04f9020d, (guint32) 0x04f9020c, (guint32) 0x04f9020a};
-static const guint32 SIMPLE_SCAN_brscan3_devices[58] = {(guint32) 0x04f90222, (guint32) 0x04f90223, (guint32) 0x04f90224, (guint32) 0x04f90225, (guint32) 0x04f90229, (guint32) 0x04f9022a, (guint32) 0x04f9022c, (guint32) 0x04f90228, (guint32) 0x04f90236, (guint32) 0x04f90227, (guint32) 0x04f9022b, (guint32) 0x04f9022d, (guint32) 0x04f9022e, (guint32) 0x04f9022f, (guint32) 0x04f90230, (guint32) 0x04f9021b, (guint32) 0x04f9021a, (guint32) 0x04f90219, (guint32) 0x04f9023f, (guint32) 0x04f90216, (guint32) 0x04f9021d, (guint32) 0x04f9021c, (guint32) 0x04f90220, (guint32) 0x04f9021e, (guint32) 0x04f9023e, (guint32) 0x04f90235, (guint32) 0x04f9023a, (guint32) 0x04f901c9, (guint32) 0x04f901ca, (guint32) 0x04f901cb, (guint32) 0x04f901cc, (guint32) 0x04f901ec, (guint32) 0x04f9020d, (guint32) 0x04f9020c, (guint32) 0x04f90257, (guint32) 0x04f9025d, (guint32) 0x04f90254, (guint32) 0x04f9025b, (guint32) 0x04f9026b, (guint32) 0x04f90258, (guint32) 0x04f9025e, (guint32) 0x04f90256, (guint32) 0x04f90240, (guint32) 0x04f9025f, (guint32) 0x04f90260, (guint32) 0x04f90261, (guint32) 0x04f90278, (guint32) 0x04f9026f, (guint32) 0x04f9026e, (guint32) 0x04f9026d, (guint32) 0x04f90234, (guint32) 0x04f90239, (guint32) 0x04f90253, (guint32) 0x04f90255, (guint32) 0x04f90259, (guint32) 0x04f9025a, (guint32) 0x04f9025c, (guint32) 0x04f90276};
-static const guint32 SIMPLE_SCAN_brscan4_devices[224] = {(guint32) 0x04f90314, (guint32) 0x04f90313, (guint32) 0x04f90312, (guint32) 0x04f90311, (guint32) 0x04f90310, (guint32) 0x04f9030f, (guint32) 0x04f90366, (guint32) 0x04f90365, (guint32) 0x04f90364, (guint32) 0x04f90350, (guint32) 0x04f9034f, (guint32) 0x04f9034e, (guint32) 0x04f9034b, (guint32) 0x04f90349, (guint32) 0x04f90347, (guint32) 0x04f90346, (guint32) 0x04f90343, (guint32) 0x04f90342, (guint32) 0x04f90341, (guint32) 0x04f90340, (guint32) 0x04f9033d, (guint32) 0x04f9033c, (guint32) 0x04f9033a, (guint32) 0x04f90339, (guint32) 0x04f90392, (guint32) 0x04f90373, (guint32) 0x04f9036e, (guint32) 0x04f9036d, (guint32) 0x04f9036c, (guint32) 0x04f9036b, (guint32) 0x04f9036a, (guint32) 0x04f90369, (guint32) 0x04f90368, (guint32) 0x04f90367, (guint32) 0x04f90338, (guint32) 0x04f90337, (guint32) 0x04f90335, (guint32) 0x04f90331, (guint32) 0x04f90330, (guint32) 0x04f90329, (guint32) 0x04f90328, (guint32) 0x04f90326, (guint32) 0x04f90324, (guint32) 0x04f90322, (guint32) 0x04f90321, (guint32) 0x04f90320, (guint32) 0x04f90372, (guint32) 0x04f90371, (guint32) 0x04f90370, (guint32) 0x04f9036f, (guint32) 0x04f90361, (guint32) 0x04f90360, (guint32) 0x04f9035e, (guint32) 0x04f9035d, (guint32) 0x04f9035c, (guint32) 0x04f9035b, (guint32) 0x04f90379, (guint32) 0x04f90378, (guint32) 0x04f90376, (guint32) 0x04f9037a, (guint32) 0x04f9037b, (guint32) 0x04f90377, (guint32) 0x04f9037f, (guint32) 0x04f9037e, (guint32) 0x04f9037d, (guint32) 0x04f9037c, (guint32) 0x04f9035a, (guint32) 0x04f90359, (guint32) 0x04f90358, (guint32) 0x04f90357, (guint32) 0x04f90356, (guint32) 0x04f90355, (guint32) 0x04f90354, (guint32) 0x04f90353, (guint32) 0x04f90351, (guint32) 0x04f90390, (guint32) 0x04f903b3, (guint32) 0x04f90396, (guint32) 0x04f90395, (guint32) 0x04f90394, (guint32) 0x04f90393, (guint32) 0x04f90380, (guint32) 0x04f90381, (guint32) 0x04f903bd, (guint32) 0x04f90383, (guint32) 0x04f90397, (guint32) 0x04f90386, (guint32) 0x04f90384, (guint32) 0x04f90385, (guint32) 0x04f90388, (guint32) 0x04f90389, (guint32) 0x04f9038b, (guint32) 0x04f9038a, (guint32) 0x04f9038c, (guint32) 0x04f9038e, (guint32) 0x04f9038f, (guint32) 0x04f9038d, (guint32) 0x04f903bc, (guint32) 0x04f903bb, (guint32) 0x04f903b6, (guint32) 0x04f903b5, (guint32) 0x04f903b4, (guint32) 0x04f90290, (guint32) 0x04f9028f, (guint32) 0x04f9028d, (guint32) 0x04f9028a, (guint32) 0x04f90284, (guint32) 0x04f90283, (guint32) 0x04f90282, (guint32) 0x04f90281, (guint32) 0x04f9027e, (guint32) 0x04f9027d, (guint32) 0x04f9027c, (guint32) 0x04f9027b, (guint32) 0x04f90280, (guint32) 0x04f9027a, (guint32) 0x04f90279, (guint32) 0x04f9027f, (guint32) 0x04f90285, (guint32) 0x04f9029a, (guint32) 0x04f9029f, (guint32) 0x04f9029e, (guint32) 0x04f90289, (guint32) 0x04f90288, (guint32) 0x04f960a0, (guint32) 0x04f960a1, (guint32) 0x04f90293, (guint32) 0x04f902b7, (guint32) 0x04f90294, (guint32) 0x04f90296, (guint32) 0x04f90298, (guint32) 0x04f902ba, (guint32) 0x04f90299, (guint32) 0x04f902bb, (guint32) 0x04f902d4, (guint32) 0x04f90291, (guint32) 0x04f902ac, (guint32) 0x04f902b5, (guint32) 0x04f90292, (guint32) 0x04f902b6, (guint32) 0x04f90295, (guint32) 0x04f902b8, (guint32) 0x04f9029c, (guint32) 0x04f902cb, (guint32) 0x04f902ca, (guint32) 0x04f902a6, (guint32) 0x04f902a7, (guint32) 0x04f902ab, (guint32) 0x04f902a5, (guint32) 0x04f902a8, (guint32) 0x04f902a0, (guint32) 0x04f902c1, (guint32) 0x04f902c0, (guint32) 0x04f902bf, (guint32) 0x04f902be, (guint32) 0x04f902bd, (guint32) 0x04f902bc, (guint32) 0x04f902b2, (guint32) 0x04f90287, (guint32) 0x04f902cf, (guint32) 0x04f902ce, (guint32) 0x04f902cd, (guint32) 0x04f902c7, (guint32) 0x04f902c6, (guint32) 0x04f902c5, (guint32) 0x04f902c4, (guint32) 0x04f902b4, (guint32) 0x04f902b3, (guint32) 0x04f902c2, (guint32) 0x04f960a4, (guint32) 0x04f960a5, (guint32) 0x04f902cc, (guint32) 0x04f902c8, (guint32) 0x04f902c3, (guint32) 0x04f902d3, (guint32) 0x04f902b1, (guint32) 0x04f902b0, (guint32) 0x04f902af, (guint32) 0x04f902ae, (guint32) 0x04f902ad, (guint32) 0x04f902d1, (guint32) 0x04f902d0, (guint32) 0x04f902fb, (guint32) 0x04f902f1, (guint32) 0x04f902f0, (guint32) 0x04f902ef, (guint32) 0x04f902ed, (guint32) 0x04f902ec, (guint32) 0x04f902ee, (guint32) 0x04f902eb, (guint32) 0x04f902e9, (guint32) 0x04f902e8, (guint32) 0x04f902fa, (guint32) 0x04f902ea, (guint32) 0x04f902e6, (guint32) 0x04f902e5, (guint32) 0x04f902e4, (guint32) 0x04f902e3, (guint32) 0x04f902e2, (guint32) 0x04f902f9, (guint32) 0x04f902de, (guint32) 0x04f902e0, (guint32) 0x04f902df, (guint32) 0x04f902e1, (guint32) 0x04f902e7, (guint32) 0x04f902fc, (guint32) 0x04f902fd, (guint32) 0x04f902fe, (guint32) 0x04f902dd, (guint32) 0x04f902c9, (guint32) 0x04f902ff, (guint32) 0x04f90300, (guint32) 0x04f902f2, (guint32) 0x04f902f3, (guint32) 0x04f902f4, (guint32) 0x04f902f8, (guint32) 0x04f902f5, (guint32) 0x04f902f6, (guint32) 0x04f902f7, (guint32) 0x04f90318, (guint32) 0x04f960a6, (guint32) 0x04f960a7, (guint32) 0x04f960a8, (guint32) 0x04f960a9};
-static const guint32 SIMPLE_SCAN_samsung_devices[69] = {(guint32) 0x04e83425, (guint32) 0x04e8341c, (guint32) 0x04e8342a, (guint32) 0x04e8343d, (guint32) 0x04e83456, (guint32) 0x04e8345a, (guint32) 0x04e83427, (guint32) 0x04e8343a, (guint32) 0x04e83428, (guint32) 0x04e8343b, (guint32) 0x04e83455, (guint32) 0x04e83421, (guint32) 0x04e83439, (guint32) 0x04e83444, (guint32) 0x04e8343f, (guint32) 0x04e8344e, (guint32) 0x04e83431, (guint32) 0x04e8345c, (guint32) 0x04e8344d, (guint32) 0x04e83462, (guint32) 0x04e83464, (guint32) 0x04e83461, (guint32) 0x04e83460, (guint32) 0x04e8340e, (guint32) 0x04e83435, (guint32) 0x04e8340f, (guint32) 0x04e83441, (guint32) 0x04e8344f, (guint32) 0x04e83413, (guint32) 0x04e8341b, (guint32) 0x04e8342e, (guint32) 0x04e83426, (guint32) 0x04e8342b, (guint32) 0x04e83433, (guint32) 0x04e83440, (guint32) 0x04e83434, (guint32) 0x04e8345b, (guint32) 0x04e83457, (guint32) 0x04e8341f, (guint32) 0x04e83453, (guint32) 0x04e8344b, (guint32) 0x04e83409, (guint32) 0x04e83412, (guint32) 0x04e83419, (guint32) 0x04e8342c, (guint32) 0x04e8343c, (guint32) 0x04e83432, (guint32) 0x04e8342d, (guint32) 0x04e83430, (guint32) 0x04e8342f, (guint32) 0x04e83446, (guint32) 0x04e8341a, (guint32) 0x04e83437, (guint32) 0x04e83442, (guint32) 0x04e83466, (guint32) 0x04e8340d, (guint32) 0x04e8341d, (guint32) 0x04e83420, (guint32) 0x04e83429, (guint32) 0x04e83443, (guint32) 0x04e83438, (guint32) 0x04e8344c, (guint32) 0x04e8345d, (guint32) 0x04e83463, (guint32) 0x04e83465, (guint32) 0x04e83450, (guint32) 0x04e83468, (guint32) 0x04e83469, (guint32) 0x04e83471};
-static const guint32 SIMPLE_SCAN_hpaio_devices[520] = {(guint32) 0x03f02311, (guint32) 0x03f09711, (guint32) 0x03f01311, (guint32) 0x03f01011, (guint32) 0x03f00f11, (guint32) 0x03f01911, (guint32) 0x03f00011, (guint32) 0x03f00111, (guint32) 0x03f00611, (guint32) 0x03f00511, (guint32) 0x03f00811, (guint32) 0x03f00711, (guint32) 0x03f00211, (guint32) 0x03f00311, (guint32) 0x03f00411, (guint32) 0x03f0062a, (guint32) 0x03f04912, (guint32) 0x03f09911, (guint32) 0x03f03802, (guint32) 0x03f07a11, (guint32) 0x03f08311, (guint32) 0x03f07b11, (guint32) 0x03f0a711, (guint32) 0x03f08d11, (guint32) 0x03f08a11, (guint32) 0x03f0bb11, (guint32) 0x03f0222a, (guint32) 0x03f0322a, (guint32) 0x03f03902, (guint32) 0x03f01002, (guint32) 0x03f0242a, (guint32) 0x03f0332a, (guint32) 0x03f0122a, (guint32) 0x03f00c2a, (guint32) 0x03f0132a, (guint32) 0x03f02c2a, (guint32) 0x03f07e11, (guint32) 0x03f07811, (guint32) 0x03f08e11, (guint32) 0x03f02d2a, (guint32) 0x03f03502, (guint32) 0x03f01102, (guint32) 0x03f06112, (guint32) 0x03f06212, (guint32) 0x03f05511, (guint32) 0x03f00f2a, (guint32) 0x03f0082a, (guint32) 0x03f07311, (guint32) 0x03f07c11, (guint32) 0x03f07d11, (guint32) 0x03f01d02, (guint32) 0x03f01202, (guint32) 0x03f01e02, (guint32) 0x03f01602, (guint32) 0x03f01302, (guint32) 0x03f01702, (guint32) 0x03f0152a, (guint32) 0x03f0142a, (guint32) 0x03f09611, (guint32) 0x03f01502, (guint32) 0x03f01902, (guint32) 0x03f01f02, (guint32) 0x03f00512, (guint32) 0x03f0aa11, (guint32) 0x03f0a311, (guint32) 0x03f01312, (guint32) 0x03f01802, (guint32) 0x03f02812, (guint32) 0x03f0bf11, (guint32) 0x03f0c011, (guint32) 0x03f0342a, (guint32) 0x03f09e17, (guint32) 0x03f09f17, (guint32) 0x03f0252a, (guint32) 0x03f0a417, (guint32) 0x03f01a02, (guint32) 0x03f09e11, (guint32) 0x03f09011, (guint32) 0x03f02602, (guint32) 0x03f0272a, (guint32) 0x03f02b02, (guint32) 0x03f01812, (guint32) 0x03f0b211, (guint32) 0x03f0352a, (guint32) 0x03f02b2a, (guint32) 0x03f0362a, (guint32) 0x03f0a517, (guint32) 0x03f01b02, (guint32) 0x03f02702, (guint32) 0x03f02c02, (guint32) 0x03f0282a, (guint32) 0x03f02104, (guint32) 0x03f0432a, (guint32) 0x03f02004, (guint32) 0x03f01a2a, (guint32) 0x03f02304, (guint32) 0x03f01b2a, (guint32) 0x03f0442a, (guint32) 0x03f08904, (guint32) 0x03f0a617, (guint32) 0x03f09a17, (guint32) 0x03f0312a, (guint32) 0x03f0452a, (guint32) 0x03f01c02, (guint32) 0x03f01811, (guint32) 0x03f09d17, (guint32) 0x03f02804, (guint32) 0x03f02904, (guint32) 0x03f01511, (guint32) 0x03f01411, (guint32) 0x03f0372a, (guint32) 0x03f00d14, (guint32) 0x03f01611, (guint32) 0x03f01711, (guint32) 0x03f00f14, (guint32) 0x03f01f2a, (guint32) 0x03f00304, (guint32) 0x03f00204, (guint32) 0x03f00804, (guint32) 0x03f02902, (guint32) 0x03f00704, (guint32) 0x03f01e2a, (guint32) 0x03f00404, (guint32) 0x03f00604, (guint32) 0x03f00904, (guint32) 0x03f01512, (guint32) 0x03f01c2a, (guint32) 0x03f00104, (guint32) 0x03f01d2a, (guint32) 0x03f00004, (guint32) 0x03f02604, (guint32) 0x03f02704, (guint32) 0x03f01804, (guint32) 0x03f01504, (guint32) 0x03f01f11, (guint32) 0x03f01204, (guint32) 0x03f01604, (guint32) 0x03f01704, (guint32) 0x03f01104, (guint32) 0x03f01e11, (guint32) 0x03f01304, (guint32) 0x03f01404, (guint32) 0x03f03104, (guint32) 0x03f01004, (guint32) 0x03f03004, (guint32) 0x03f03304, (guint32) 0x03f05004, (guint32) 0x03f01712, (guint32) 0x03f02e11, (guint32) 0x03f00517, (guint32) 0x03f08811, (guint32) 0x03f01317, (guint32) 0x03f04117, (guint32) 0x03f03217, (guint32) 0x03f03e17, (guint32) 0x03f00c17, (guint32) 0x03f0b511, (guint32) 0x03f04217, (guint32) 0x03f04317, (guint32) 0x03f02b17, (guint32) 0x03f03017, (guint32) 0x03f02d17, (guint32) 0x03f02c17, (guint32) 0x03f00b2a, (guint32) 0x03f0112a, (guint32) 0x03f08911, (guint32) 0x03f07c04, (guint32) 0x03f00912, (guint32) 0x03f03011, (guint32) 0x03f0032a, (guint32) 0x03f0002a, (guint32) 0x03f0102a, (guint32) 0x03f03402, (guint32) 0x03f05617, (guint32) 0x03f05717, (guint32) 0x03f0042a, (guint32) 0x03f00f17, (guint32) 0x03f04004, (guint32) 0x03f01017, (guint32) 0x03f01e17, (guint32) 0x03f00317, (guint32) 0x03f00f12, (guint32) 0x03f02f11, (guint32) 0x03f0052a, (guint32) 0x03f04717, (guint32) 0x03f03202, (guint32) 0x03f00e2a, (guint32) 0x03f0262a, (guint32) 0x03f03302, (guint32) 0x03f00417, (guint32) 0x03f00212, (guint32) 0x03f01412, (guint32) 0x03f07804, (guint32) 0x03f03b11, (guint32) 0x03f01117, (guint32) 0x03f03f11, (guint32) 0x03f04f17, (guint32) 0x03f04e17, (guint32) 0x03f03602, (guint32) 0x03f05817, (guint32) 0x03f01d17, (guint32) 0x03f03c11, (guint32) 0x03f07904, (guint32) 0x03f04d11, (guint32) 0x03f0072a, (guint32) 0x03f01417, (guint32) 0x03f04c11, (guint32) 0x03f0c111, (guint32) 0x03f04417, (guint32) 0x03f05017, (guint32) 0x03f0022a, (guint32) 0x03f0012a, (guint32) 0x03f0092a, (guint32) 0x03f07f11, (guint32) 0x03f04811, (guint32) 0x03f03a17, (guint32) 0x03f00a2a, (guint32) 0x03f00312, (guint32) 0x03f09411, (guint32) 0x03f09b11, (guint32) 0x03f03917, (guint32) 0x03f04a17, (guint32) 0x03f03817, (guint32) 0x03f0b911, (guint32) 0x03f05417, (guint32) 0x03f05217, (guint32) 0x03f05317, (guint32) 0x03f05d17, (guint32) 0x03f08711, (guint32) 0x03f05c17, (guint32) 0x03f09a11, (guint32) 0x03f02811, (guint32) 0x03f07d04, (guint32) 0x03f02a11, (guint32) 0x03f02b11, (guint32) 0x03f00217, (guint32) 0x03f02911, (guint32) 0x03f02404, (guint32) 0x03f03511, (guint32) 0x03f00812, (guint32) 0x03f00b17, (guint32) 0x03f0c302, (guint32) 0x03f05917, (guint32) 0x03f05a17, (guint32) 0x03f05b17, (guint32) 0x03f04911, (guint32) 0x03f03611, (guint32) 0x03f07611, (guint32) 0x03f07a04, (guint32) 0x03f02517, (guint32) 0x03f02917, (guint32) 0x03f02a17, (guint32) 0x03f01e04, (guint32) 0x03f00717, (guint32) 0x03f02504, (guint32) 0x03f03711, (guint32) 0x03f0ac11, (guint32) 0x03f0be11, (guint32) 0x03f0c211, (guint32) 0x03f01c17, (guint32) 0x03f04e11, (guint32) 0x03f02e17, (guint32) 0x03f04511, (guint32) 0x03f08011, (guint32) 0x03f00412, (guint32) 0x03f03617, (guint32) 0x03f02f17, (guint32) 0x03f03117, (guint32) 0x03f0c911, (guint32) 0x03f0ca11, (guint32) 0x03f04611, (guint32) 0x03f03c17, (guint32) 0x03f03717, (guint32) 0x03f02617, (guint32) 0x03f01112, (guint32) 0x03f00612, (guint32) 0x03f06717, (guint32) 0x03f09511, (guint32) 0x03f07617, (guint32) 0x03f07317, (guint32) 0x03f08d17, (guint32) 0x03f01617, (guint32) 0x03f07a17, (guint32) 0x03f07517, (guint32) 0x03f09311, (guint32) 0x03f0a011, (guint32) 0x03f03317, (guint32) 0x03f03417, (guint32) 0x03f0a211, (guint32) 0x03f05611, (guint32) 0x03f05011, (guint32) 0x03f00117, (guint32) 0x03f05111, (guint32) 0x03f00817, (guint32) 0x03f05211, (guint32) 0x03f07004, (guint32) 0x03f00917, (guint32) 0x03f01917, (guint32) 0x03f03517, (guint32) 0x03f07104, (guint32) 0x03f01517, (guint32) 0x03f03112, (guint32) 0x03f07817, (guint32) 0x03f0ad11, (guint32) 0x03f0b011, (guint32) 0x03f08517, (guint32) 0x03f08a17, (guint32) 0x03f0c711, (guint32) 0x03f06117, (guint32) 0x03f06917, (guint32) 0x03f06812, (guint32) 0x03f06d12, (guint32) 0x03f07204, (guint32) 0x03f00a17, (guint32) 0x03f07404, (guint32) 0x03f06817, (guint32) 0x03f01b04, (guint32) 0x03f01a04, (guint32) 0x03f01c04, (guint32) 0x03f01904, (guint32) 0x03f07504, (guint32) 0x03f07604, (guint32) 0x03f00714, (guint32) 0x03f09c11, (guint32) 0x03f07b17, (guint32) 0x03f08817, (guint32) 0x03f05711, (guint32) 0x03f07704, (guint32) 0x03f07e04, (guint32) 0x03f03111, (guint32) 0x03f06017, (guint32) 0x03f03d11, (guint32) 0x03f05c11, (guint32) 0x03f07b04, (guint32) 0x03f06a17, (guint32) 0x03f02417, (guint32) 0x03f05411, (guint32) 0x03f01f04, (guint32) 0x03f06711, (guint32) 0x03f07417, (guint32) 0x03f09717, (guint32) 0x03f02317, (guint32) 0x03f06611, (guint32) 0x03f06c11, (guint32) 0x03f09d11, (guint32) 0x03f07711, (guint32) 0x03f04712, (guint32) 0x03f08c11, (guint32) 0x03f05712, (guint32) 0x03f02a12, (guint32) 0x03f06b11, (guint32) 0x03f0c511, (guint32) 0x03f02e12, (guint32) 0x03f0c411, (guint32) 0x03f09917, (guint32) 0x03f09c17, (guint32) 0x03f07411, (guint32) 0x03f06c17, (guint32) 0x03f05812, (guint32) 0x03f06512, (guint32) 0x03f06612, (guint32) 0x03f06412, (guint32) 0x03f0c611, (guint32) 0x03f0c811, (guint32) 0x03f01a17, (guint32) 0x03f02b12, (guint32) 0x03f02c12, (guint32) 0x03f07511, (guint32) 0x03f06217, (guint32) 0x03f07d17, (guint32) 0x03f06317, (guint32) 0x03f07917, (guint32) 0x03f07217, (guint32) 0x03f0a117, (guint32) 0x03f0c802, (guint32) 0x03f05811, (guint32) 0x03f0c402, (guint32) 0x03f02411, (guint32) 0x03f05d11, (guint32) 0x03f06417, (guint32) 0x03f06617, (guint32) 0x03f08917, (guint32) 0x03f05117, (guint32) 0x03f07111, (guint32) 0x03f01f12, (guint32) 0x03f06811, (guint32) 0x03f02012, (guint32) 0x03f08604, (guint32) 0x03f06d11, (guint32) 0x03f03a11, (guint32) 0x03f03012, (guint32) 0x03f08211, (guint32) 0x03f07211, (guint32) 0x03f0a111, (guint32) 0x03f0b411, (guint32) 0x03f09b17, (guint32) 0x03f0b111, (guint32) 0x03f0b611, (guint32) 0x03f0c311, (guint32) 0x03f01f17, (guint32) 0x03f06004, (guint32) 0x03f04f11, (guint32) 0x03f0cc11, (guint32) 0x03f06104, (guint32) 0x03f05b11, (guint32) 0x03f08104, (guint32) 0x03f0cd11, (guint32) 0x03f0a004, (guint32) 0x03f08704, (guint32) 0x03f04312, (guint32) 0x03f04212, (guint32) 0x03f06f17, (guint32) 0x03f07c17, (guint32) 0x03f09517, (guint32) 0x03f05911, (guint32) 0x03f05e12, (guint32) 0x03f00b14, (guint32) 0x03f0c502, (guint32) 0x03f02d11, (guint32) 0x03f03404, (guint32) 0x03f04b11, (guint32) 0x03f01014, (guint32) 0x03f06a11, (guint32) 0x03f07312, (guint32) 0x03f07011, (guint32) 0x03f05311, (guint32) 0x03f03312, (guint32) 0x03f04412, (guint32) 0x03f05412, (guint32) 0x03f05512, (guint32) 0x03f04512, (guint32) 0x03f08204, (guint32) 0x03f0a511, (guint32) 0x03f0af11, (guint32) 0x03f0ba11, (guint32) 0x03f08504, (guint32) 0x03f05d12, (guint32) 0x03f05c12, (guint32) 0x03f08404, (guint32) 0x03f07412, (guint32) 0x03f07212, (guint32) 0x03f08804, (guint32) 0x03f04612, (guint32) 0x03f02611, (guint32) 0x03f05a11, (guint32) 0x03f02612, (guint32) 0x03f0c602, (guint32) 0x03f06012, (guint32) 0x03f03a02, (guint32) 0x03f06911, (guint32) 0x03f0b002, (guint32) 0x03f04111, (guint32) 0x03f06511, (guint32) 0x03f04211, (guint32) 0x03f02512, (guint32) 0x03f0c702, (guint32) 0x03f02002, (guint32) 0x03f03c02, (guint32) 0x03f04311, (guint32) 0x03f0b802, (guint32) 0x03f05e11, (guint32) 0x03f03412, (guint32) 0x03f02112, (guint32) 0x03f04812, (guint32) 0x03f06f11, (guint32) 0x03f0a611, (guint32) 0x03f0bc11, (guint32) 0x03f03e02, (guint32) 0x03f02212, (guint32) 0x03f0b202, (guint32) 0x03f06e12, (guint32) 0x03f0dc11, (guint32) 0x03f02312, (guint32) 0x03f0b402, (guint32) 0x03f0c002, (guint32) 0x03f0b602, (guint32) 0x03f05612, (guint32) 0x03f03612, (guint32) 0x03f0c102, (guint32) 0x03f0de11, (guint32) 0x03f07717, (guint32) 0x03f07117, (guint32) 0x03f05b12, (guint32) 0x03f06411, (guint32) 0x03f0ba02, (guint32) 0x03f0c202, (guint32) 0x03f0be02, (guint32) 0x03f0bb02, (guint32) 0x03f03812, (guint32) 0x03f04012, (guint32) 0x03f03912, (guint32) 0x03f0d102, (guint32) 0x03f05312, (guint32) 0x03f02712, (guint32) 0x03f05912, (guint32) 0x03f07112, (guint32) 0x03f07012, (guint32) 0x03f06f12, (guint32) 0x03f07712, (guint32) 0x03f07612, (guint32) 0x03f0bc02, (guint32) 0x03f0d002, (guint32) 0x03f08417, (guint32) 0x03f02017, (guint32) 0x03f02117, (guint32) 0x03f08317, (guint32) 0x03f09617, (guint32) 0x03f00d12, (guint32) 0x03f0bd02, (guint32) 0x03f02217, (guint32) 0x03f00b12, (guint32) 0x03f01212, (guint32) 0x03f03c2a, (guint32) 0x03f0382a, (guint32) 0x03f0582a, (guint32) 0x03f0552a, (guint32) 0x03f03e2a, (guint32) 0x03f03f2a, (guint32) 0x03f0e311, (guint32) 0x03f0e111};
-static const guint32 SIMPLE_SCAN_epkowa_devices[201] = {(guint32) 0x04b80101, (guint32) 0x04b80102, (guint32) 0x04b80103, (guint32) 0x04b80104, (guint32) 0x04b80105, (guint32) 0x04b80106, (guint32) 0x04b80107, (guint32) 0x04b80108, (guint32) 0x04b80109, (guint32) 0x04b8010a, (guint32) 0x04b8010b, (guint32) 0x04b8010c, (guint32) 0x04b8010d, (guint32) 0x04b8010e, (guint32) 0x04b8010f, (guint32) 0x04b80110, (guint32) 0x04b80112, (guint32) 0x04b80114, (guint32) 0x04b80116, (guint32) 0x04b80118, (guint32) 0x04b80119, (guint32) 0x04b8011a, (guint32) 0x04b8011b, (guint32) 0x04b8011c, (guint32) 0x04b8011d, (guint32) 0x04b8011e, (guint32) 0x04b8011f, (guint32) 0x04b80120, (guint32) 0x04b80121, (guint32) 0x04b80122, (guint32) 0x04b80126, (guint32) 0x04b80128, (guint32) 0x04b80129, (guint32) 0x04b8012a, (guint32) 0x04b8012b, (guint32) 0x04b8012c, (guint32) 0x04b8012d, (guint32) 0x04b8012e, (guint32) 0x04b8012f, (guint32) 0x04b80130, (guint32) 0x04b80131, (guint32) 0x04b80133, (guint32) 0x04b80135, (guint32) 0x04b80136, (guint32) 0x04b80137, (guint32) 0x04b80138, (guint32) 0x04b8013a, (guint32) 0x04b8013b, (guint32) 0x04b8013c, (guint32) 0x04b8013d, (guint32) 0x04b80142, (guint32) 0x04b80143, (guint32) 0x04b80144, (guint32) 0x04b80147, (guint32) 0x04b8014a, (guint32) 0x04b8014b, (guint32) 0x04b80151, (guint32) 0x04b80153, (guint32) 0x04b80801, (guint32) 0x04b80802, (guint32) 0x04b80805, (guint32) 0x04b80806, (guint32) 0x04b80807, (guint32) 0x04b80808, (guint32) 0x04b8080a, (guint32) 0x04b8080c, (guint32) 0x04b8080d, (guint32) 0x04b8080e, (guint32) 0x04b8080f, (guint32) 0x04b80810, (guint32) 0x04b80811, (guint32) 0x04b80813, (guint32) 0x04b80814, (guint32) 0x04b80815, (guint32) 0x04b80817, (guint32) 0x04b80818, (guint32) 0x04b80819, (guint32) 0x04b8081a, (guint32) 0x04b8081c, (guint32) 0x04b8081d, (guint32) 0x04b8081f, (guint32) 0x04b80820, (guint32) 0x04b80821, (guint32) 0x04b80827, (guint32) 0x04b80828, (guint32) 0x04b80829, (guint32) 0x04b8082a, (guint32) 0x04b8082b, (guint32) 0x04b8082e, (guint32) 0x04b8082f, (guint32) 0x04b80830, (guint32) 0x04b80831, (guint32) 0x04b80833, (guint32) 0x04b80834, (guint32) 0x04b80835, (guint32) 0x04b80836, (guint32) 0x04b80837, (guint32) 0x04b80838, (guint32) 0x04b80839, (guint32) 0x04b8083a, (guint32) 0x04b8083c, (guint32) 0x04b8083f, (guint32) 0x04b80841, (guint32) 0x04b80843, (guint32) 0x04b80844, (guint32) 0x04b80846, (guint32) 0x04b80847, (guint32) 0x04b80848, (guint32) 0x04b80849, (guint32) 0x04b8084a, (guint32) 0x04b8084c, (guint32) 0x04b8084d, (guint32) 0x04b8084f, (guint32) 0x04b80850, (guint32) 0x04b80851, (guint32) 0x04b80852, (guint32) 0x04b80853, (guint32) 0x04b80854, (guint32) 0x04b80855, (guint32) 0x04b80856, (guint32) 0x04b8085c, (guint32) 0x04b8085d, (guint32) 0x04b8085e, (guint32) 0x04b8085f, (guint32) 0x04b80860, (guint32) 0x04b80861, (guint32) 0x04b80862, (guint32) 0x04b80863, (guint32) 0x04b80864, (guint32) 0x04b80865, (guint32) 0x04b80866, (guint32) 0x04b80869, (guint32) 0x04b8086a, (guint32) 0x04b80870, (guint32) 0x04b80871, (guint32) 0x04b80872, (guint32) 0x04b80873, (guint32) 0x04b80878, (guint32) 0x04b80879, (guint32) 0x04b8087b, (guint32) 0x04b8087c, (guint32) 0x04b8087d, (guint32) 0x04b8087e, (guint32) 0x04b8087f, (guint32) 0x04b80880, (guint32) 0x04b80881, (guint32) 0x04b80883, (guint32) 0x04b80884, (guint32) 0x04b80885, (guint32) 0x04b8088f, (guint32) 0x04b80890, (guint32) 0x04b80891, (guint32) 0x04b80892, (guint32) 0x04b80893, (guint32) 0x04b80894, (guint32) 0x04b80895, (guint32) 0x04b80896, (guint32) 0x04b80897, (guint32) 0x04b80898, (guint32) 0x04b80899, (guint32) 0x04b8089a, (guint32) 0x04b8089b, (guint32) 0x04b8089c, (guint32) 0x04b8089d, (guint32) 0x04b8089e, (guint32) 0x04b8089f, (guint32) 0x04b808a0, (guint32) 0x04b808a1, (guint32) 0x04b808a5, (guint32) 0x04b808a6, (guint32) 0x04b808a8, (guint32) 0x04b808a9, (guint32) 0x04b808aa, (guint32) 0x04b808ab, (guint32) 0x04b808ac, (guint32) 0x04b808ad, (guint32) 0x04b808ae, (guint32) 0x04b808af, (guint32) 0x04b808b0, (guint32) 0x04b808b3, (guint32) 0x04b808b4, (guint32) 0x04b808b5, (guint32) 0x04b808b6, (guint32) 0x04b808b7, (guint32) 0x04b808b8, (guint32) 0x04b808b9, (guint32) 0x04b808bd, (guint32) 0x04b808be, (guint32) 0x04b808bf, (guint32) 0x04b808c0, (guint32) 0x04b808c1, (guint32) 0x04b808c3, (guint32) 0x04b808c4, (guint32) 0x04b808c5, (guint32) 0x04b808c6, (guint32) 0x04b808c7, (guint32) 0x04b808c8, (guint32) 0x04b808c9, (guint32) 0x04b808ca, (guint32) 0x04b808cd, (guint32) 0x04b808d0};
-
-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 417 "simple-scan.c"
-}
-
-
-SimpleScan* simple_scan_construct (GType object_type, ScanDevice* device) {
-	SimpleScan * self = NULL;
-	ScanDevice* _tmp0_ = NULL;
-	ScanDevice* _tmp1_ = NULL;
-#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 437 "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 444 "simple-scan.c"
-}
-
-
-static gpointer _book_ref0 (gpointer self) {
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	return self ? book_ref (self) : NULL;
-#line 451 "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 ((SimpleScan*) self, _sender, device, options);
-#line 458 "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 ((SimpleScan*) self, _sender);
-#line 465 "simple-scan.c"
-}
-
-
-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 ((SimpleScan*) self, _sender, profile, quality);
-#line 472 "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 ((SimpleScan*) self, _sender, devices);
-#line 479 "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 ((SimpleScan*) self, _sender, resource);
-#line 486 "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 ((SimpleScan*) self, _sender);
-#line 493 "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 ((SimpleScan*) self, _sender, info);
-#line 500 "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 ((SimpleScan*) self, _sender, line);
-#line 507 "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 ((SimpleScan*) self, _sender);
-#line 514 "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 ((SimpleScan*) self, _sender);
-#line 521 "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 ((SimpleScan*) self, _sender, error_code, error_string);
-#line 528 "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 ((SimpleScan*) self, _sender);
-#line 535 "simple-scan.c"
-}
-
-
-static void ___lambda22_ (SimpleScan* self) {
-	Scanner* _tmp0_ = NULL;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->scanner;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scanner_redetect (_tmp0_);
-#line 545 "simple-scan.c"
-}
-
-
-static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self) {
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	___lambda22_ ((SimpleScan*) self);
-#line 552 "simple-scan.c"
-}
-
-
-static void ___lambda23_ (SimpleScan* self) {
-	Scanner* _tmp0_ = NULL;
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->scanner;
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scanner_redetect (_tmp0_);
-#line 562 "simple-scan.c"
-}
-
-
-static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self) {
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	___lambda23_ ((SimpleScan*) self);
-#line 569 "simple-scan.c"
-}
-
-
-static void _scan_device_unref0_ (gpointer var) {
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
-#line 576 "simple-scan.c"
-}
-
-
-static void _g_list_free__scan_device_unref0_ (GList* self) {
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_list_free (self);
-#line 585 "simple-scan.c"
-}
-
-
-static void simple_scan_real_startup (GApplication* base) {
-	SimpleScan * self;
-	UserInterface* _tmp0_ = NULL;
-	UserInterface* _tmp1_ = NULL;
-	Book* _tmp2_ = NULL;
-	Book* _tmp3_ = NULL;
-	Book* _tmp4_ = NULL;
-	UserInterface* _tmp5_ = NULL;
-	UserInterface* _tmp6_ = NULL;
-	UserInterface* _tmp7_ = NULL;
-	Scanner* _tmp8_ = NULL;
-	Scanner* _tmp9_ = NULL;
-	Scanner* _tmp10_ = NULL;
-	Scanner* _tmp11_ = NULL;
-	Scanner* _tmp12_ = NULL;
-	Scanner* _tmp13_ = NULL;
-	Scanner* _tmp14_ = NULL;
-	Scanner* _tmp15_ = NULL;
-	Scanner* _tmp16_ = NULL;
-	Scanner* _tmp17_ = NULL;
-	ScanDevice* _tmp25_ = NULL;
-	GError * _inner_error_ = NULL;
-#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_application_get_type (), 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"
-	g_object_ref_sink (_tmp0_);
-#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_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"
-	_tmp3_ = _tmp2_;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = _book_ref0 (_tmp3_);
-#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 = _tmp4_;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp5_ = self->priv->ui;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp5_, "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"
-	_tmp6_ = self->priv->ui;
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp6_, "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"
-	_tmp7_ = self->priv->ui;
-#line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp7_, "email", (GCallback) _simple_scan_email_cb_user_interface_email, self, 0);
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp8_ = 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 = _tmp8_;
-#line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp9_ = self->priv->scanner;
-#line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp9_, "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"
-	_tmp10_ = self->priv->scanner;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp10_, "request-authorization", (GCallback) _simple_scan_authorize_cb_scanner_request_authorization, self, 0);
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp11_ = self->priv->scanner;
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp11_, "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"
-	_tmp12_ = self->priv->scanner;
-#line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp12_, "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"
-	_tmp13_ = self->priv->scanner;
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp13_, "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"
-	_tmp14_ = self->priv->scanner;
-#line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp14_, "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"
-	_tmp15_ = self->priv->scanner;
-#line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp15_, "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"
-	_tmp16_ = self->priv->scanner;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp16_, "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"
-	_tmp17_ = self->priv->scanner;
-#line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp17_, "scanning-changed", (GCallback) _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed, self, 0);
-#line 689 "simple-scan.c"
-	{
-		GUsbContext* _tmp18_ = NULL;
-		GUsbContext* _tmp19_ = NULL;
-		GUsbContext* _tmp20_ = NULL;
-		GUsbContext* _tmp21_ = NULL;
-		GUsbContext* _tmp22_ = NULL;
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp19_ = g_usb_context_new (&_inner_error_);
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp18_ = _tmp19_;
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 702 "simple-scan.c"
-			goto __catch4_g_error;
-		}
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp20_ = _tmp18_;
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp18_ = NULL;
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (self->priv->usb_context);
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		self->priv->usb_context = _tmp20_;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp21_ = self->priv->usb_context;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_signal_connect_object (_tmp21_, "device-added", (GCallback) ____lambda22__g_usb_context_device_added, self, 0);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp22_ = self->priv->usb_context;
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_signal_connect_object (_tmp22_, "device-removed", (GCallback) ____lambda23__g_usb_context_device_removed, self, 0);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (_tmp18_);
-#line 723 "simple-scan.c"
-	}
-	goto __finally4;
-	__catch4_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		e = _inner_error_;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_inner_error_ = NULL;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp23_ = e;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp24_ = _tmp23_->message;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_warning ("simple-scan.vala:73: Failed to create USB context: %s\n", _tmp24_);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_error_free0 (e);
-#line 743 "simple-scan.c"
-	}
-	__finally4:
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 65 "/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 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_clear_error (&_inner_error_);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return;
-#line 754 "simple-scan.c"
-	}
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp25_ = self->priv->default_device;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp25_ != NULL) {
-#line 760 "simple-scan.c"
-		GList* device_list = NULL;
-		ScanDevice* _tmp26_ = NULL;
-		ScanDevice* _tmp27_ = NULL;
-		UserInterface* _tmp28_ = NULL;
-		GList* _tmp29_ = NULL;
-		UserInterface* _tmp30_ = NULL;
-		ScanDevice* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device_list = NULL;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp26_ = self->priv->default_device;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp27_ = _scan_device_ref0 (_tmp26_);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device_list = g_list_append (device_list, _tmp27_);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp28_ = self->priv->ui;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp29_ = device_list;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_set_scan_devices (_tmp28_, _tmp29_, NULL);
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp30_ = self->priv->ui;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp31_ = self->priv->default_device;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp32_ = _tmp31_->name;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_set_selected_device (_tmp30_, _tmp32_);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		__g_list_free__scan_device_unref0_0 (device_list);
-#line 793 "simple-scan.c"
-	}
-}
-
-
-static void simple_scan_real_activate (GApplication* base) {
-	SimpleScan * self;
-	UserInterface* _tmp0_ = NULL;
-	Scanner* _tmp1_ = NULL;
-#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)->activate ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->ui;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	user_interface_start (_tmp0_);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = self->priv->scanner;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scanner_start (_tmp1_);
-#line 814 "simple-scan.c"
-}
-
-
-static void simple_scan_real_shutdown (GApplication* base) {
-	SimpleScan * self;
-	Scanner* _tmp0_ = NULL;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self = (SimpleScan*) base;
-#line 95 "/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_application_get_type (), GtkApplication));
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_book_unref0 (self->priv->book);
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self->priv->book = NULL;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (self->priv->ui);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self->priv->ui = NULL;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (self->priv->usb_context);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self->priv->usb_context = NULL;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->scanner;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scanner_free (_tmp0_);
-#line 841 "simple-scan.c"
-}
-
-
-static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scanner, GList* devices) {
-	GList* devices_copy = NULL;
-	GList* _tmp0_ = NULL;
-	GList* _tmp1_ = NULL;
-	ScanDevice* _tmp2_ = NULL;
-	GList* _tmp10_ = NULL;
-	guint _tmp11_ = 0U;
-	gchar* missing_driver = NULL;
-	gboolean _tmp12_ = FALSE;
-	UserInterface* _tmp14_ = NULL;
-	GList* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (scanner != NULL);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = devices;
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = g_list_copy (_tmp0_);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	devices_copy = _tmp1_;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = self->priv->default_device;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp2_ != NULL) {
-#line 871 "simple-scan.c"
-		gboolean default_in_list = FALSE;
-		GList* _tmp3_ = NULL;
-		gboolean _tmp8_ = FALSE;
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		default_in_list = FALSE;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp3_ = devices_copy;
-#line 879 "simple-scan.c"
-		{
-			GList* device_collection = NULL;
-			GList* device_it = NULL;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			device_collection = _tmp3_;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 887 "simple-scan.c"
-				ScanDevice* device = NULL;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				device = (ScanDevice*) device_it->data;
-#line 891 "simple-scan.c"
-				{
-					ScanDevice* _tmp4_ = NULL;
-					const gchar* _tmp5_ = NULL;
-					ScanDevice* _tmp6_ = NULL;
-					const gchar* _tmp7_ = NULL;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp4_ = device;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp5_ = _tmp4_->name;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp6_ = self->priv->default_device;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp7_ = _tmp6_->name;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (g_strcmp0 (_tmp5_, _tmp7_) == 0) {
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						default_in_list = TRUE;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						break;
-#line 911 "simple-scan.c"
-					}
-				}
-			}
-		}
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = default_in_list;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (!_tmp8_) {
-#line 920 "simple-scan.c"
-			ScanDevice* _tmp9_ = NULL;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp9_ = self->priv->default_device;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			devices_copy = g_list_prepend (devices_copy, _tmp9_);
-#line 926 "simple-scan.c"
-		}
-	}
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp10_ = devices_copy;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp11_ = g_list_length (_tmp10_);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self->priv->have_devices = _tmp11_ > ((guint) 0);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	missing_driver = NULL;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp12_ = self->priv->have_devices;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (!_tmp12_) {
-#line 941 "simple-scan.c"
-		gchar* _tmp13_ = NULL;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp13_ = simple_scan_suggest_driver (self);
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (missing_driver);
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		missing_driver = _tmp13_;
-#line 949 "simple-scan.c"
-	}
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp14_ = self->priv->ui;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp15_ = devices_copy;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp16_ = missing_driver;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	user_interface_set_scan_devices (_tmp14_, _tmp15_, _tmp16_);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (missing_driver);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_list_free0 (devices_copy);
-#line 963 "simple-scan.c"
-}
-
-
-static void _g_free0_ (gpointer var) {
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	var = (g_free (var), NULL);
-#line 970 "simple-scan.c"
-}
-
-
-static gint g_ptr_array_get_length (GPtrArray* self) {
-	gint result;
-	guint _tmp0_ = 0U;
-#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = self->len;
-#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = (gint) _tmp0_;
-#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 985 "simple-scan.c"
-}
-
-
-static void g_ptr_array_set_length (GPtrArray* self, gint value) {
-	gint _tmp0_ = 0;
-#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_if_fail (self != NULL);
-#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = value;
-#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_ptr_array_set_size (self, _tmp0_);
-#line 997 "simple-scan.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 1004 "simple-scan.c"
-}
-
-
-gchar* simple_scan_suggest_driver (SimpleScan* self) {
-	gchar* result = NULL;
-	GUsbContext* _tmp0_ = NULL;
-	GHashTable* driver_map = NULL;
-	GHashFunc _tmp1_ = NULL;
-	GEqualFunc _tmp2_ = NULL;
-	GHashTable* _tmp3_ = NULL;
-	GHashTable* _tmp4_ = NULL;
-	GHashTable* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
-	GHashTable* _tmp7_ = NULL;
-	GHashTable* _tmp8_ = NULL;
-	GHashTable* _tmp9_ = NULL;
-	GHashTable* _tmp10_ = NULL;
-	GPtrArray* devices = NULL;
-	GUsbContext* _tmp11_ = NULL;
-	GPtrArray* _tmp12_ = NULL;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->usb_context;
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp0_ == NULL) {
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = NULL;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 1035 "simple-scan.c"
-	}
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = g_direct_hash;
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = g_direct_equal;
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = g_hash_table_new_full (_tmp1_, _tmp2_, NULL, _g_free0_);
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	driver_map = _tmp3_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = driver_map;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_add_devices (self, _tmp4_, SIMPLE_SCAN_brscan_devices, G_N_ELEMENTS (SIMPLE_SCAN_brscan_devices), "brscan");
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp5_ = driver_map;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_add_devices (self, _tmp5_, SIMPLE_SCAN_brscan2_devices, G_N_ELEMENTS (SIMPLE_SCAN_brscan2_devices), "brscan2");
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp6_ = driver_map;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_add_devices (self, _tmp6_, SIMPLE_SCAN_brscan3_devices, G_N_ELEMENTS (SIMPLE_SCAN_brscan3_devices), "brscan3");
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp7_ = driver_map;
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_add_devices (self, _tmp7_, SIMPLE_SCAN_brscan4_devices, G_N_ELEMENTS (SIMPLE_SCAN_brscan4_devices), "brscan4");
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp8_ = driver_map;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_add_devices (self, _tmp8_, SIMPLE_SCAN_samsung_devices, G_N_ELEMENTS (SIMPLE_SCAN_samsung_devices), "samsung");
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp9_ = driver_map;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_add_devices (self, _tmp9_, SIMPLE_SCAN_hpaio_devices, G_N_ELEMENTS (SIMPLE_SCAN_hpaio_devices), "hpaio");
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp10_ = driver_map;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_add_devices (self, _tmp10_, SIMPLE_SCAN_epkowa_devices, G_N_ELEMENTS (SIMPLE_SCAN_epkowa_devices), "epkowa");
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp11_ = self->priv->usb_context;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp12_ = g_usb_context_get_devices (_tmp11_);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	devices = _tmp12_;
-#line 1079 "simple-scan.c"
-	{
-		gint i = 0;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		i = 0;
-#line 1084 "simple-scan.c"
-		{
-			gboolean _tmp13_ = FALSE;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp13_ = TRUE;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			while (TRUE) {
-#line 1091 "simple-scan.c"
-				gint _tmp15_ = 0;
-				GPtrArray* _tmp16_ = NULL;
-				gint _tmp17_ = 0;
-				gint _tmp18_ = 0;
-				GUsbDevice* device = NULL;
-				GPtrArray* _tmp19_ = NULL;
-				gpointer* _tmp20_ = NULL;
-				gint _tmp20__length1 = 0;
-				gint _tmp21_ = 0;
-				GUsbDevice* _tmp22_ = NULL;
-				GUsbDevice* _tmp23_ = NULL;
-				gchar* driver = NULL;
-				GHashTable* _tmp24_ = NULL;
-				GUsbDevice* _tmp25_ = NULL;
-				guint16 _tmp26_ = 0U;
-				GUsbDevice* _tmp27_ = NULL;
-				guint16 _tmp28_ = 0U;
-				gconstpointer _tmp29_ = NULL;
-				gchar* _tmp30_ = NULL;
-				const gchar* _tmp31_ = NULL;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (!_tmp13_) {
-#line 1114 "simple-scan.c"
-					gint _tmp14_ = 0;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp14_ = i;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					i = _tmp14_ + 1;
-#line 1120 "simple-scan.c"
-				}
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp13_ = FALSE;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp15_ = i;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp16_ = devices;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp17_ = g_ptr_array_get_length (_tmp16_);
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp18_ = _tmp17_;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (!(_tmp15_ < _tmp18_)) {
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					break;
-#line 1136 "simple-scan.c"
-				}
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp19_ = devices;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp20_ = _tmp19_->pdata;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp20__length1 = (gint) _tmp19_->len;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp21_ = i;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp22_ = _tmp20_[_tmp21_];
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				device = _tmp23_;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp24_ = driver_map;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp25_ = device;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp26_ = g_usb_device_get_vid (_tmp25_);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp27_ = device;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp28_ = g_usb_device_get_pid (_tmp27_);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp29_ = g_hash_table_lookup (_tmp24_, (gpointer) ((guintptr) ((guint32) ((_tmp26_ << 16) | _tmp28_))));
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp30_ = g_strdup ((const gchar*) _tmp29_);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				driver = _tmp30_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp31_ = driver;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (_tmp31_ != NULL) {
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					result = driver;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_object_unref0 (device);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_ptr_array_unref0 (devices);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_hash_table_unref0 (driver_map);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					return result;
-#line 1182 "simple-scan.c"
-				}
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_free0 (driver);
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_object_unref0 (device);
-#line 1188 "simple-scan.c"
-			}
-		}
-	}
-#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_ptr_array_unref0 (devices);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_hash_table_unref0 (driver_map);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	return result;
-#line 1200 "simple-scan.c"
-}
-
-
-static void simple_scan_add_devices (SimpleScan* self, GHashTable* map, guint32* devices, int devices_length1, const gchar* driver) {
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (map != NULL);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (driver != NULL);
-#line 1211 "simple-scan.c"
-	{
-		gint i = 0;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		i = 0;
-#line 1216 "simple-scan.c"
-		{
-			gboolean _tmp0_ = FALSE;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp0_ = TRUE;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			while (TRUE) {
-#line 1223 "simple-scan.c"
-				gint _tmp2_ = 0;
-				guint32* _tmp3_ = NULL;
-				gint _tmp3__length1 = 0;
-				GHashTable* _tmp4_ = NULL;
-				guint32* _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				guint32 _tmp7_ = 0U;
-				const gchar* _tmp8_ = NULL;
-				gchar* _tmp9_ = NULL;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (!_tmp0_) {
-#line 1236 "simple-scan.c"
-					gint _tmp1_ = 0;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp1_ = i;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					i = _tmp1_ + 1;
-#line 1242 "simple-scan.c"
-				}
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp0_ = FALSE;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp2_ = i;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp3_ = devices;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp3__length1 = devices_length1;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (!(_tmp2_ < _tmp3__length1)) {
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					break;
-#line 1256 "simple-scan.c"
-				}
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp4_ = map;
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp5_ = devices;
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp5__length1 = devices_length1;
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp6_ = i;
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp7_ = _tmp5_[_tmp6_];
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp8_ = driver;
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp9_ = g_strdup (_tmp8_);
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				g_hash_table_insert (_tmp4_, (gpointer) ((guintptr) _tmp7_), _tmp9_);
-#line 1274 "simple-scan.c"
-			}
-		}
-	}
-}
-
-
-static void simple_scan_authorize_cb (SimpleScan* self, Scanner* scanner, const gchar* resource) {
-	gchar* username = NULL;
-	gchar* password = NULL;
-	UserInterface* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	Scanner* _tmp4_ = NULL;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (scanner != NULL);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (resource != NULL);
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->ui;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = resource;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	user_interface_authorize (_tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (username);
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	username = _tmp2_;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (password);
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	password = _tmp3_;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = scanner;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scanner_authorize (_tmp4_, username, password);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (password);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (username);
-#line 1317 "simple-scan.c"
-}
-
-
-static Page* simple_scan_append_page (SimpleScan* self) {
-	Page* result = NULL;
-	Page* page = NULL;
-	Book* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	Page* _tmp3_ = NULL;
-	ScanDirection scan_direction = 0;
-	gboolean do_crop = FALSE;
-	gchar* named_crop = NULL;
-	gint width = 0;
-	gint height = 0;
-	gint dpi = 0;
-	gint cx = 0;
-	gint cy = 0;
-	gint cw = 0;
-	gint ch = 0;
-	Page* _tmp10_ = NULL;
-	gint _tmp43_ = 0;
-	gint _tmp44_ = 0;
-	gint _tmp45_ = 0;
-	ScanDirection _tmp46_ = 0;
-	Page* _tmp47_ = NULL;
-	Book* _tmp48_ = NULL;
-	Page* _tmp49_ = NULL;
-	gboolean _tmp50_ = FALSE;
-	UserInterface* _tmp60_ = NULL;
-	Page* _tmp61_ = NULL;
-	Page* _tmp62_ = NULL;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->book;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = book_get_page (_tmp0_, -1);
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp1_;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = page;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp3_ != NULL) {
-#line 1362 "simple-scan.c"
-		Page* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp4_ = page;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp5_ = page_get_has_data (_tmp4_);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp6_ = _tmp5_;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp2_ = !_tmp6_;
-#line 1374 "simple-scan.c"
-	} else {
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp2_ = FALSE;
-#line 1378 "simple-scan.c"
-	}
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp2_) {
-#line 1382 "simple-scan.c"
-		UserInterface* _tmp7_ = NULL;
-		Page* _tmp8_ = NULL;
-		Page* _tmp9_ = NULL;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp7_ = self->priv->ui;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = page;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_set_selected_page (_tmp7_, _tmp8_);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp9_ = page;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		page_start (_tmp9_);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = page;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 1400 "simple-scan.c"
-	}
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	do_crop = FALSE;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	named_crop = NULL;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	width = 100;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	height = 100;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	dpi = 100;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	cx = 0;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	cy = 0;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	cw = 0;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	ch = 0;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp10_ = page;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp10_ != NULL) {
-#line 1426 "simple-scan.c"
-		Page* _tmp11_ = NULL;
-		ScanDirection _tmp12_ = 0;
-		ScanDirection _tmp13_ = 0;
-		Page* _tmp14_ = NULL;
-		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		Page* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		Page* _tmp20_ = NULL;
-		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
-		Page* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
-		gboolean _tmp25_ = FALSE;
-		gboolean _tmp26_ = FALSE;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11_ = page;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp12_ = page_get_scan_direction (_tmp11_);
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp13_ = _tmp12_;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		scan_direction = _tmp13_;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp14_ = page;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp15_ = page_get_width (_tmp14_);
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp16_ = _tmp15_;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		width = _tmp16_;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp17_ = page;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp18_ = page_get_height (_tmp17_);
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp19_ = _tmp18_;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		height = _tmp19_;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp20_ = page;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp21_ = page_get_dpi (_tmp20_);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp22_ = _tmp21_;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		dpi = _tmp22_;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp23_ = page;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp24_ = page_get_has_crop (_tmp23_);
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp25_ = _tmp24_;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		do_crop = _tmp25_;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp26_ = do_crop;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp26_) {
-#line 1487 "simple-scan.c"
-			Page* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-			const gchar* _tmp29_ = NULL;
-			gchar* _tmp30_ = NULL;
-			Page* _tmp31_ = NULL;
-			gint _tmp32_ = 0;
-			gint _tmp33_ = 0;
-			Page* _tmp34_ = NULL;
-			gint _tmp35_ = 0;
-			gint _tmp36_ = 0;
-			Page* _tmp37_ = NULL;
-			gint _tmp38_ = 0;
-			gint _tmp39_ = 0;
-			Page* _tmp40_ = NULL;
-			gint _tmp41_ = 0;
-			gint _tmp42_ = 0;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp27_ = page;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp28_ = page_get_crop_name (_tmp27_);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp29_ = _tmp28_;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp30_ = g_strdup (_tmp29_);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (named_crop);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			named_crop = _tmp30_;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp31_ = page;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp32_ = page_get_crop_x (_tmp31_);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp33_ = _tmp32_;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			cx = _tmp33_;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp34_ = page;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp35_ = page_get_crop_y (_tmp34_);
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp36_ = _tmp35_;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			cy = _tmp36_;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp37_ = page;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp38_ = page_get_crop_width (_tmp37_);
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp39_ = _tmp38_;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			cw = _tmp39_;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp40_ = page;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp41_ = page_get_crop_height (_tmp40_);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp42_ = _tmp41_;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			ch = _tmp42_;
-#line 1548 "simple-scan.c"
-		}
-	}
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp43_ = width;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp44_ = height;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp45_ = dpi;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp46_ = scan_direction;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp47_ = page_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_page_unref0 (page);
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp47_;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp48_ = self->priv->book;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp49_ = page;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	book_append_page (_tmp48_, _tmp49_);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp50_ = do_crop;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp50_) {
-#line 1575 "simple-scan.c"
-		const gchar* _tmp51_ = NULL;
-		Page* _tmp57_ = NULL;
-		gint _tmp58_ = 0;
-		gint _tmp59_ = 0;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp51_ = named_crop;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp51_ != NULL) {
-#line 1584 "simple-scan.c"
-			Page* _tmp52_ = NULL;
-			const gchar* _tmp53_ = NULL;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp52_ = page;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp53_ = named_crop;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			page_set_named_crop (_tmp52_, _tmp53_);
-#line 1593 "simple-scan.c"
-		} else {
-			Page* _tmp54_ = NULL;
-			gint _tmp55_ = 0;
-			gint _tmp56_ = 0;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp54_ = page;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp55_ = cw;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp56_ = ch;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			page_set_custom_crop (_tmp54_, _tmp55_, _tmp56_);
-#line 1606 "simple-scan.c"
-		}
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp57_ = page;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp58_ = cx;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp59_ = cy;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		page_move_crop (_tmp57_, _tmp58_, _tmp59_);
-#line 1616 "simple-scan.c"
-	}
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp60_ = self->priv->ui;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp61_ = page;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	user_interface_set_selected_page (_tmp60_, _tmp61_);
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp62_ = page;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page_start (_tmp62_);
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	result = page;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (named_crop);
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	return result;
-#line 1634 "simple-scan.c"
-}
-
-
-static void simple_scan_scanner_new_page_cb (SimpleScan* self, Scanner* scanner) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (scanner != NULL);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = simple_scan_append_page (self);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = _tmp0_;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_page_unref0 (_tmp1_);
-#line 1651 "simple-scan.c"
-}
-
-
-static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar* device_name) {
-	gchar* result = NULL;
-	gchar* device_id = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	CdClient* client = NULL;
-	CdClient* _tmp3_ = NULL;
-	CdDevice* device = NULL;
-	CdProfile* profile = NULL;
-	CdDevice* _tmp19_ = NULL;
-	CdProfile* _tmp20_ = NULL;
-	CdProfile* _tmp21_ = NULL;
-	CdProfile* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	CdProfile* _tmp31_ = NULL;
-	const gchar* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	CdProfile* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_val_if_fail (device_name != NULL, NULL);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = device_name;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = g_strdup_printf ("sane:%s", _tmp0_);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	device_id = _tmp1_;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = device_name;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:282: Getting color profile for device %s", _tmp2_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = cd_client_new ();
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	client = _tmp3_;
-#line 1698 "simple-scan.c"
-	{
-		CdClient* _tmp4_ = NULL;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp4_ = client;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		cd_client_connect_sync (_tmp4_, NULL, &_inner_error_);
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1707 "simple-scan.c"
-			goto __catch5_g_error;
-		}
-	}
-	goto __finally5;
-	__catch5_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		e = _inner_error_;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_inner_error_ = NULL;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp5_ = e;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp6_ = _tmp5_->message;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:291: Failed to connect to colord: %s", _tmp6_);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = NULL;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_error_free0 (e);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 1737 "simple-scan.c"
-	}
-	__finally5:
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 285 "/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 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_clear_error (&_inner_error_);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return NULL;
-#line 1752 "simple-scan.c"
-	}
-	{
-		CdDevice* _tmp7_ = NULL;
-		CdClient* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		CdDevice* _tmp10_ = NULL;
-		CdDevice* _tmp11_ = NULL;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = client;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp9_ = device_id;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp10_ = cd_client_find_device_by_property_sync (_tmp8_, CD_DEVICE_PROPERTY_SERIAL, _tmp9_, NULL, &_inner_error_);
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp7_ = _tmp10_;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1770 "simple-scan.c"
-			goto __catch6_g_error;
-		}
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11_ = _tmp7_;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp7_ = NULL;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (device);
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device = _tmp11_;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (_tmp7_);
-#line 1783 "simple-scan.c"
-	}
-	goto __finally6;
-	__catch6_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp12_ = NULL;
-		GError* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		e = _inner_error_;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_inner_error_ = NULL;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp12_ = device_name;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp13_ = e;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp14_ = _tmp13_->message;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:302: Unable to find colord device %s: %s", _tmp12_, _tmp14_);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = NULL;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_error_free0 (e);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (device);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 1816 "simple-scan.c"
-	}
-	__finally6:
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (device);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 296 "/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 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_clear_error (&_inner_error_);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return NULL;
-#line 1833 "simple-scan.c"
-	}
-	{
-		CdDevice* _tmp15_ = NULL;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp15_ = device;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		cd_device_connect_sync (_tmp15_, NULL, &_inner_error_);
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1843 "simple-scan.c"
-			goto __catch7_g_error;
-		}
-	}
-	goto __finally7;
-	__catch7_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp16_ = NULL;
-		GError* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		e = _inner_error_;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_inner_error_ = NULL;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp16_ = device_name;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp17_ = e;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp18_ = _tmp17_->message;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:312: Failed to get properties from the device %s: %s", _tmp16_, _tmp18_);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = NULL;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_error_free0 (e);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (device);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 1878 "simple-scan.c"
-	}
-	__finally7:
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (device);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 306 "/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 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_clear_error (&_inner_error_);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return NULL;
-#line 1895 "simple-scan.c"
-	}
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp19_ = device;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp20_ = cd_device_get_default_profile (_tmp19_);
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	profile = _tmp20_;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp21_ = profile;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp21_ == NULL) {
-#line 1907 "simple-scan.c"
-		const gchar* _tmp22_ = NULL;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp22_ = device_name;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:319: No default color profile for device: %s", _tmp22_);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = NULL;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (profile);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (device);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 1925 "simple-scan.c"
-	}
-	{
-		CdProfile* _tmp23_ = NULL;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp23_ = profile;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		cd_profile_connect_sync (_tmp23_, NULL, &_inner_error_);
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1935 "simple-scan.c"
-			goto __catch8_g_error;
-		}
-	}
-	goto __finally8;
-	__catch8_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp24_ = NULL;
-		GError* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		e = _inner_error_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_inner_error_ = NULL;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp24_ = device_name;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp25_ = e;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp26_ = _tmp25_->message;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:329: Failed to get properties from the profile %s: %s", _tmp24_, _tmp26_);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = NULL;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_error_free0 (e);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (profile);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (device);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 1972 "simple-scan.c"
-	}
-	__finally8:
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (profile);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (device);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 323 "/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 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_clear_error (&_inner_error_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return NULL;
-#line 1991 "simple-scan.c"
-	}
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp27_ = profile;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp28_ = cd_profile_get_filename (_tmp27_);
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp29_ = _tmp28_;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp29_ == NULL) {
-#line 2001 "simple-scan.c"
-		const gchar* _tmp30_ = NULL;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp30_ = device_name;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:335: No icc color profile for the device %s", _tmp30_);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = NULL;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (profile);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (device);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_object_unref0 (client);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (device_id);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 2019 "simple-scan.c"
-	}
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp31_ = profile;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp32_ = cd_profile_get_filename (_tmp31_);
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp33_ = _tmp32_;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp34_ = device_name;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:339: Using color profile %s for device %s", _tmp33_, _tmp34_);
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp35_ = profile;
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp36_ = cd_profile_get_filename (_tmp35_);
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp37_ = _tmp36_;
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp38_ = g_strdup (_tmp37_);
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	result = _tmp38_;
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (profile);
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (device);
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (client);
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (device_id);
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	return result;
-#line 2051 "simple-scan.c"
-}
-
-
-static void simple_scan_scanner_page_info_cb (SimpleScan* self, Scanner* scanner, ScanPageInfo* info) {
-	ScanPageInfo* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	ScanPageInfo* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	ScanPageInfo* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	Page* page = NULL;
-	Page* _tmp6_ = NULL;
-	ScanPageInfo* _tmp7_ = NULL;
-	ScanPageInfo* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (scanner != NULL);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (info != NULL);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = info;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = _tmp0_->width;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = info;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = _tmp2_->height;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = info;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp5_ = _tmp4_->depth;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:348: Page is %d pixels wide, %d pixels high, %d bits " \
-"per pixel", _tmp1_, _tmp3_, _tmp5_);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp6_ = simple_scan_append_page (self);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp6_;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp7_ = info;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page_set_page_info (page, _tmp7_);
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp8_ = info;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp9_ = _tmp8_->device;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp10_ = simple_scan_get_profile_for_device (self, _tmp9_);
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp11_ = _tmp10_;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page_set_color_profile (page, _tmp11_);
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (_tmp11_);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_page_unref0 (page);
-#line 2111 "simple-scan.c"
-}
-
-
-static void simple_scan_scanner_line_cb (SimpleScan* self, Scanner* scanner, ScanLine* line) {
-	Page* page = NULL;
-	Book* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	Page* _tmp4_ = NULL;
-	ScanLine* _tmp5_ = NULL;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (scanner != NULL);
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (line != NULL);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->book;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = self->priv->book;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = _tmp2_;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp4_;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp5_ = line;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page_parse_scan_line (page, _tmp5_);
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_page_unref0 (page);
-#line 2147 "simple-scan.c"
-}
-
-
-static void simple_scan_scanner_page_done_cb (SimpleScan* self, Scanner* scanner) {
-	Page* page = NULL;
-	Book* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	Page* _tmp4_ = NULL;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (scanner != NULL);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->book;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = self->priv->book;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = _tmp2_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp4_;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page_finish (page);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_page_unref0 (page);
-#line 2178 "simple-scan.c"
-}
-
-
-static void simple_scan_remove_empty_page (SimpleScan* self) {
-	Page* page = NULL;
-	Book* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->book;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = self->priv->book;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = _tmp2_;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp4_;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp5_ = page;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp6_ = page_get_has_data (_tmp5_);
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp7_ = _tmp6_;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (!_tmp7_) {
-#line 2214 "simple-scan.c"
-		Book* _tmp8_ = NULL;
-		Page* _tmp9_ = NULL;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = self->priv->book;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp9_ = page;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		book_delete_page (_tmp8_, _tmp9_);
-#line 2223 "simple-scan.c"
-	}
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_page_unref0 (page);
-#line 2227 "simple-scan.c"
-}
-
-
-static void simple_scan_scanner_document_done_cb (SimpleScan* self, Scanner* scanner) {
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (scanner != NULL);
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_remove_empty_page (self);
-#line 2238 "simple-scan.c"
-}
-
-
-static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, gint error_code, const gchar* error_string) {
-	gint _tmp0_ = 0;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (scanner != NULL);
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (error_string != NULL);
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_remove_empty_page (self);
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = error_code;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp0_ != ((gint) SANE_STATUS_CANCELLED)) {
-#line 2256 "simple-scan.c"
-		UserInterface* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp1_ = self->priv->ui;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp2_ = _ ("Failed to scan");
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp3_ = error_string;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp4_ = self->priv->have_devices;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_show_error (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 2271 "simple-scan.c"
-	}
-}
-
-
-static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner* scanner) {
-	UserInterface* _tmp0_ = NULL;
-	Scanner* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (scanner != NULL);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->ui;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = scanner;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = scanner_is_scanning (_tmp1_);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	user_interface_set_scanning (_tmp0_, _tmp2_);
-#line 2292 "simple-scan.c"
-}
-
-
-static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gchar* device, ScanOptions* options) {
-	ScanOptions* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	const gchar* _tmp2_ = NULL;
-	Scanner* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	Scanner* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	ScanOptions* _tmp9_ = NULL;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (ui != NULL);
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (options != NULL);
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = options;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = _tmp0_->dpi;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = device;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:404: Requesting scan at %d dpi from device '%s'", _tmp1_, _tmp2_);
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = self->priv->scanner;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = scanner_is_scanning (_tmp3_);
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (!_tmp4_) {
-#line 2325 "simple-scan.c"
-		Page* _tmp5_ = NULL;
-		Page* _tmp6_ = NULL;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp5_ = simple_scan_append_page (self);
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp6_ = _tmp5_;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_page_unref0 (_tmp6_);
-#line 2334 "simple-scan.c"
-	}
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp7_ = self->priv->scanner;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp8_ = device;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp9_ = options;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scanner_scan (_tmp7_, _tmp8_, _tmp9_);
-#line 2344 "simple-scan.c"
-}
-
-
-static void simple_scan_cancel_cb (SimpleScan* self, UserInterface* ui) {
-	Scanner* _tmp0_ = NULL;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (ui != NULL);
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->scanner;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scanner_cancel (_tmp0_);
-#line 2358 "simple-scan.c"
-}
-
-
-static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar* prefix, const gchar* extension) {
-	gchar* result = NULL;
-	gchar* filename = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* path = NULL;
-	GError * _inner_error_ = NULL;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_val_if_fail (prefix != NULL, NULL);
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_val_if_fail (extension != NULL, NULL);
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = prefix;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = extension;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	filename = _tmp2_;
-#line 2384 "simple-scan.c"
-	{
-		gint fd = 0;
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp3_ = filename;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (path);
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		path = _tmp4_;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		fd = _tmp5_;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2403 "simple-scan.c"
-			goto __catch9_g_error;
-		}
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp6_ = fd;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		close (_tmp6_);
-#line 2410 "simple-scan.c"
-	}
-	goto __finally9;
-	__catch9_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		e = _inner_error_;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_inner_error_ = NULL;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp7_ = e;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = _tmp7_->message;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_warning ("simple-scan.vala:431: Error saving email attachment: %s", _tmp8_);
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = NULL;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_error_free0 (e);
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (path);
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (filename);
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 2438 "simple-scan.c"
-	}
-	__finally9:
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (path);
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (filename);
-#line 424 "/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 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_clear_error (&_inner_error_);
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return NULL;
-#line 2453 "simple-scan.c"
-	}
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	result = path;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (filename);
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	return result;
-#line 2461 "simple-scan.c"
-}
-
-
-static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gchar* profile, gint quality) {
-	gboolean saved = FALSE;
-	gchar* command_line = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (ui != NULL);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (profile != NULL);
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	saved = FALSE;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = g_strdup ("xdg-email");
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	command_line = _tmp0_;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = profile;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 2488 "simple-scan.c"
-		gchar* path = NULL;
-		gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp2_ = simple_scan_get_temporary_filename (self, "scan", "pdf");
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		path = _tmp2_;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp3_ = path;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp3_ != NULL) {
-#line 2500 "simple-scan.c"
-			GFile* file = NULL;
-			const gchar* _tmp4_ = NULL;
-			GFile* _tmp5_ = NULL;
-			UserInterface* _tmp6_ = NULL;
-			const gchar* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp4_ = path;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp5_ = g_file_new_for_path (_tmp4_);
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			file = _tmp5_;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp6_ = ui;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			user_interface_show_progress_dialog (_tmp6_);
-#line 2520 "simple-scan.c"
-			{
-				Book* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
-				GFile* _tmp9_ = NULL;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp7_ = self->priv->book;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp8_ = quality;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp9_ = file;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				book_save (_tmp7_, "pdf", _tmp8_, _tmp9_, &_inner_error_);
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2535 "simple-scan.c"
-					goto __catch10_g_error;
-				}
-			}
-			goto __finally10;
-			__catch10_g_error:
-			{
-				GError* e = NULL;
-				UserInterface* _tmp10_ = NULL;
-				GError* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				e = _inner_error_;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_inner_error_ = NULL;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp10_ = ui;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				user_interface_hide_progress_dialog (_tmp10_);
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp11_ = e;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp12_ = _tmp11_->message;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				g_warning ("simple-scan.vala:459: Unable to save email file: %s", _tmp12_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_error_free0 (e);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_object_unref0 (file);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_free0 (path);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_free0 (command_line);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				return;
-#line 2570 "simple-scan.c"
-			}
-			__finally10:
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_object_unref0 (file);
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_free0 (path);
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_free0 (command_line);
-#line 452 "/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 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				g_clear_error (&_inner_error_);
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				return;
-#line 2587 "simple-scan.c"
-			}
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp13_ = command_line;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp14_ = path;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp15_ = g_strdup_printf (" --attach %s", _tmp14_);
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp16_ = _tmp15_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp17_ = g_strconcat (_tmp13_, _tmp16_, NULL);
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (command_line);
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			command_line = _tmp17_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (_tmp16_);
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_object_unref0 (file);
-#line 2607 "simple-scan.c"
-		}
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (path);
-#line 2611 "simple-scan.c"
-	} else {
-		{
-			gint i = 0;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			i = 0;
-#line 2617 "simple-scan.c"
-			{
-				gboolean _tmp18_ = FALSE;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp18_ = TRUE;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				while (TRUE) {
-#line 2624 "simple-scan.c"
-					gint _tmp20_ = 0;
-					Book* _tmp21_ = NULL;
-					guint _tmp22_ = 0U;
-					guint _tmp23_ = 0U;
-					gchar* path = NULL;
-					gchar* _tmp24_ = NULL;
-					const gchar* _tmp25_ = NULL;
-					GFile* file = NULL;
-					const gchar* _tmp26_ = NULL;
-					GFile* _tmp27_ = NULL;
-					const gchar* _tmp36_ = NULL;
-					const gchar* _tmp37_ = NULL;
-					gchar* _tmp38_ = NULL;
-					gchar* _tmp39_ = NULL;
-					gchar* _tmp40_ = NULL;
-					gboolean _tmp41_ = FALSE;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (!_tmp18_) {
-#line 2643 "simple-scan.c"
-						gint _tmp19_ = 0;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp19_ = i;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						i = _tmp19_ + 1;
-#line 2649 "simple-scan.c"
-					}
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp18_ = FALSE;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp20_ = i;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp21_ = self->priv->book;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp22_ = book_get_n_pages (_tmp21_);
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp23_ = _tmp22_;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (!(((guint) _tmp20_) < _tmp23_)) {
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						break;
-#line 2665 "simple-scan.c"
-					}
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp24_ = simple_scan_get_temporary_filename (self, "scan", "jpg");
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					path = _tmp24_;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp25_ = path;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (_tmp25_ == NULL) {
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						saved = FALSE;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_free0 (path);
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						break;
-#line 2681 "simple-scan.c"
-					}
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp26_ = path;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp27_ = g_file_new_for_path (_tmp26_);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					file = _tmp27_;
-#line 2689 "simple-scan.c"
-					{
-						Book* _tmp28_ = NULL;
-						gint _tmp29_ = 0;
-						Page* _tmp30_ = NULL;
-						Page* _tmp31_ = NULL;
-						gint _tmp32_ = 0;
-						GFile* _tmp33_ = NULL;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp28_ = self->priv->book;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp29_ = i;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp30_ = book_get_page (_tmp28_, _tmp29_);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp31_ = _tmp30_;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp32_ = quality;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp33_ = file;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						page_save (_tmp31_, "jpeg", _tmp32_, _tmp33_, &_inner_error_);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_page_unref0 (_tmp31_);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2715 "simple-scan.c"
-							goto __catch11_g_error;
-						}
-					}
-					goto __finally11;
-					__catch11_g_error:
-					{
-						GError* e = NULL;
-						GError* _tmp34_ = NULL;
-						const gchar* _tmp35_ = NULL;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						e = _inner_error_;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_inner_error_ = NULL;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp34_ = e;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp35_ = _tmp34_->message;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						g_warning ("simple-scan.vala:483: Unable to save email file: %s", _tmp35_);
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_error_free0 (e);
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_object_unref0 (file);
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_free0 (path);
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_free0 (command_line);
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						return;
-#line 2745 "simple-scan.c"
-					}
-					__finally11:
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_object_unref0 (file);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_free0 (path);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_free0 (command_line);
-#line 477 "/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 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						g_clear_error (&_inner_error_);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						return;
-#line 2762 "simple-scan.c"
-					}
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp36_ = command_line;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp37_ = path;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp38_ = g_strdup_printf (" --attach %s", _tmp37_);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp39_ = _tmp38_;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_free0 (command_line);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					command_line = _tmp40_;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_free0 (_tmp39_);
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp41_ = saved;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (!_tmp41_) {
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_object_unref0 (file);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_free0 (path);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						break;
-#line 2790 "simple-scan.c"
-					}
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_object_unref0 (file);
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_free0 (path);
-#line 2796 "simple-scan.c"
-				}
-			}
-		}
-	}
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp42_ = command_line;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:493: Launching email client: %s", _tmp42_);
-#line 2805 "simple-scan.c"
-	{
-		const gchar* _tmp43_ = NULL;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp43_ = command_line;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_spawn_command_line_async (_tmp43_, &_inner_error_);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2814 "simple-scan.c"
-			goto __catch12_g_error;
-		}
-	}
-	goto __finally12;
-	__catch12_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp44_ = NULL;
-		const gchar* _tmp45_ = NULL;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		e = _inner_error_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_inner_error_ = NULL;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp44_ = e;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp45_ = _tmp44_->message;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_warning ("simple-scan.vala:500: Unable to start email: %s", _tmp45_);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_error_free0 (e);
-#line 2836 "simple-scan.c"
-	}
-	__finally12:
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (command_line);
-#line 494 "/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 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_clear_error (&_inner_error_);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return;
-#line 2849 "simple-scan.c"
-	}
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (command_line);
-#line 2853 "simple-scan.c"
-}
-
-
-static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
-	gchar* prefix = NULL;
-	GLogLevelFlags _tmp0_ = 0;
-	FILE* _tmp8_ = NULL;
-	GTimer* _tmp9_ = NULL;
-	gdouble _tmp10_ = 0.0;
-	const gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (message != NULL);
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = log_level;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	switch (_tmp0_ & G_LOG_LEVEL_MASK) {
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		case G_LOG_LEVEL_ERROR:
-#line 2874 "simple-scan.c"
-		{
-			gchar* _tmp1_ = NULL;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp1_ = g_strdup ("ERROR:");
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (prefix);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			prefix = _tmp1_;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			break;
-#line 2885 "simple-scan.c"
-		}
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		case G_LOG_LEVEL_CRITICAL:
-#line 2889 "simple-scan.c"
-		{
-			gchar* _tmp2_ = NULL;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp2_ = g_strdup ("CRITICAL:");
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (prefix);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			prefix = _tmp2_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			break;
-#line 2900 "simple-scan.c"
-		}
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		case G_LOG_LEVEL_WARNING:
-#line 2904 "simple-scan.c"
-		{
-			gchar* _tmp3_ = NULL;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp3_ = g_strdup ("WARNING:");
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (prefix);
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			prefix = _tmp3_;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			break;
-#line 2915 "simple-scan.c"
-		}
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		case G_LOG_LEVEL_MESSAGE:
-#line 2919 "simple-scan.c"
-		{
-			gchar* _tmp4_ = NULL;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp4_ = g_strdup ("MESSAGE:");
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (prefix);
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			prefix = _tmp4_;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			break;
-#line 2930 "simple-scan.c"
-		}
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		case G_LOG_LEVEL_INFO:
-#line 2934 "simple-scan.c"
-		{
-			gchar* _tmp5_ = NULL;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp5_ = g_strdup ("INFO:");
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (prefix);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			prefix = _tmp5_;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			break;
-#line 2945 "simple-scan.c"
-		}
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		case G_LOG_LEVEL_DEBUG:
-#line 2949 "simple-scan.c"
-		{
-			gchar* _tmp6_ = NULL;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp6_ = g_strdup ("DEBUG:");
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (prefix);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			prefix = _tmp6_;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			break;
-#line 2960 "simple-scan.c"
-		}
-		default:
-		{
-			gchar* _tmp7_ = NULL;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp7_ = g_strdup ("LOG:");
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (prefix);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			prefix = _tmp7_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			break;
-#line 2973 "simple-scan.c"
-		}
-	}
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp8_ = simple_scan_log_file;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp9_ = simple_scan_log_timer;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp10_ = g_timer_elapsed (_tmp9_, NULL);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp11_ = prefix;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp12_ = message;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	fprintf (_tmp8_, "[%+.2fs] %s %s\n", _tmp10_, _tmp11_, _tmp12_);
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp13_ = simple_scan_debug_enabled;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp13_) {
-#line 2992 "simple-scan.c"
-		FILE* _tmp14_ = NULL;
-		GTimer* _tmp15_ = NULL;
-		gdouble _tmp16_ = 0.0;
-		const gchar* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp14_ = stderr;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp15_ = simple_scan_log_timer;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp16_ = g_timer_elapsed (_tmp15_, NULL);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp17_ = prefix;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp18_ = message;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		fprintf (_tmp14_, "[%+.2fs] %s %s\n", _tmp16_, _tmp17_, _tmp18_);
-#line 3010 "simple-scan.c"
-	}
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (prefix);
-#line 3014 "simple-scan.c"
-}
-
-
-static glong string_strnlen (gchar* str, glong maxlen) {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 3037 "simple-scan.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 3045 "simple-scan.c"
-	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 3057 "simple-scan.c"
-	}
-}
-
-
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 3081 "simple-scan.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3087 "simple-scan.c"
-	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 3091 "simple-scan.c"
-	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 3095 "simple-scan.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 3107 "simple-scan.c"
-	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 3117 "simple-scan.c"
-	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 3123 "simple-scan.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3137 "simple-scan.c"
-	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3147 "simple-scan.c"
-	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 3153 "simple-scan.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 3162 "simple-scan.c"
-	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 3182 "simple-scan.c"
-}
-
-
-static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
-	guint8* data = NULL;
-	gint data_length1 = 0;
-	gint _data_size_ = 0;
-	const gchar* _tmp0_ = NULL;
-	guint8* _tmp1_ = NULL;
-	size_t _tmp2_;
-	FILE* fixed_file = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	FILE* _tmp6_ = NULL;
-	FILE* _tmp7_ = NULL;
-	gint offset = 0;
-	gint line_number = 0;
-	gint xref_offset = 0;
-	gint xref_line = 0;
-	gint startxref_line = 0;
-	gint fixed_size = 0;
-	GString* line = NULL;
-	GString* _tmp8_ = NULL;
-	const gchar* _tmp102_ = NULL;
-	const gchar* _tmp103_ = NULL;
-	gchar* _tmp104_ = NULL;
-	gchar* _tmp105_ = NULL;
-	gint _tmp106_ = 0;
-	gboolean _tmp107_ = FALSE;
-	GError * _inner_error_ = NULL;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (filename != NULL);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = filename;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_file_get_contents (_tmp0_, (gchar**) (&_tmp1_), &_tmp2_, &_inner_error_);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	data = (g_free (data), NULL);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	data = _tmp1_;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	data_length1 = _tmp2_;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_data_size_ = data_length1;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_propagate_error (error, _inner_error_);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		data = (g_free (data), NULL);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return;
-#line 3236 "simple-scan.c"
-	}
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = filename;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = g_strconcat (_tmp3_, ".fixed", NULL);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp5_ = _tmp4_;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp6_ = g_fopen (_tmp5_, "w");
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp7_ = _tmp6_;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (_tmp5_);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	fixed_file = _tmp7_;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	offset = 0;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	line_number = 0;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	xref_offset = 0;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	xref_line = -1;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	startxref_line = -1;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	fixed_size = -1;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp8_ = g_string_new ("");
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	line = _tmp8_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	while (TRUE) {
-#line 3270 "simple-scan.c"
-		gint _tmp9_ = 0;
-		gint end_offset = 0;
-		gint _tmp10_ = 0;
-		GString* _tmp11_ = NULL;
-		GString* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		GString* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
-		gboolean _tmp25_ = FALSE;
-		gint _tmp26_ = 0;
-		gint _tmp100_ = 0;
-		gint _tmp101_ = 0;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp9_ = offset;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (!(_tmp9_ < data_length1)) {
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			break;
-#line 3289 "simple-scan.c"
-		}
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp10_ = offset;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		end_offset = _tmp10_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11_ = line;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_string_assign (_tmp11_, "");
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		while (TRUE) {
-#line 3301 "simple-scan.c"
-			gint _tmp12_ = 0;
-			guint8 c = 0U;
-			gint _tmp13_ = 0;
-			guint8 _tmp14_ = 0U;
-			GString* _tmp15_ = NULL;
-			guint8 _tmp16_ = 0U;
-			gint _tmp17_ = 0;
-			guint8 _tmp18_ = 0U;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp12_ = end_offset;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (!(_tmp12_ < data_length1)) {
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				break;
-#line 3316 "simple-scan.c"
-			}
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp13_ = end_offset;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp14_ = data[_tmp13_];
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			c = _tmp14_;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp15_ = line;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp16_ = c;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			g_string_append_c (_tmp15_, (gchar) _tmp16_);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp17_ = end_offset;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			end_offset = _tmp17_ + 1;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp18_ = c;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (_tmp18_ == ((guint8) '\n')) {
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				break;
-#line 3340 "simple-scan.c"
-			}
-		}
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp19_ = line;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp20_ = _tmp19_->str;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (g_strcmp0 (_tmp20_, "startxref\n") == 0) {
-#line 3349 "simple-scan.c"
-			gint _tmp21_ = 0;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp21_ = line_number;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			startxref_line = _tmp21_;
-#line 3355 "simple-scan.c"
-		}
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp22_ = line;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp23_ = _tmp22_->str;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (g_strcmp0 (_tmp23_, "xref\n") == 0) {
-#line 3363 "simple-scan.c"
-			gint _tmp24_ = 0;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp24_ = line_number;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			xref_line = _tmp24_;
-#line 3369 "simple-scan.c"
-		}
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp26_ = line_number;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp26_ < 2) {
-#line 3375 "simple-scan.c"
-			GString* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-			gboolean _tmp29_ = FALSE;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp27_ = line;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp28_ = _tmp27_->str;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp29_ = g_str_has_prefix (_tmp28_, "%%");
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp25_ = _tmp29_;
-#line 3387 "simple-scan.c"
-		} else {
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp25_ = FALSE;
-#line 3391 "simple-scan.c"
-		}
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp25_) {
-#line 3395 "simple-scan.c"
-			gint _tmp30_ = 0;
-			FILE* _tmp31_ = NULL;
-			GString* _tmp32_ = NULL;
-			const gchar* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
-			gchar* _tmp35_ = NULL;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp30_ = xref_offset;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			xref_offset = _tmp30_ - 1;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp31_ = fixed_file;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp32_ = line;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp33_ = _tmp32_->str;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp34_ = string_substring (_tmp33_, (glong) 1, (glong) -1);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp35_ = _tmp34_;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			fprintf (_tmp31_, "%s", _tmp35_);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (_tmp35_);
-#line 3420 "simple-scan.c"
-		} else {
-			gboolean _tmp36_ = FALSE;
-			gint _tmp37_ = 0;
-			gint _tmp38_ = 0;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp37_ = line_number;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp38_ = xref_line;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (_tmp37_ == (_tmp38_ + 1)) {
-#line 3431 "simple-scan.c"
-				GString* _tmp39_ = NULL;
-				const gchar* _tmp40_ = NULL;
-				gboolean _tmp41_ = FALSE;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp39_ = line;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp40_ = _tmp39_->str;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp41_ = g_str_has_prefix (_tmp40_, "1 ");
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp36_ = _tmp41_;
-#line 3443 "simple-scan.c"
-			} else {
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp36_ = FALSE;
-#line 3447 "simple-scan.c"
-			}
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (_tmp36_) {
-#line 3451 "simple-scan.c"
-				GString* _tmp42_ = NULL;
-				const gchar* _tmp43_ = NULL;
-				gchar* _tmp44_ = NULL;
-				gchar* _tmp45_ = NULL;
-				gint _tmp46_ = 0;
-				FILE* _tmp47_ = NULL;
-				gint _tmp48_ = 0;
-				FILE* _tmp49_ = NULL;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp42_ = line;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp43_ = _tmp42_->str;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp44_ = string_substring (_tmp43_, (glong) 2, (glong) -1);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp45_ = _tmp44_;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp46_ = atoi (_tmp45_);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				fixed_size = _tmp46_ + 1;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_g_free0 (_tmp45_);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp47_ = fixed_file;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp48_ = fixed_size;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				fprintf (_tmp47_, "0 %d\n", _tmp48_);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp49_ = fixed_file;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				fprintf (_tmp49_, "0000000000 65535 f \n");
-#line 3484 "simple-scan.c"
-			} else {
-				gboolean _tmp50_ = FALSE;
-				gint _tmp51_ = 0;
-				gint _tmp52_ = 0;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp51_ = line_number;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp52_ = xref_line;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (_tmp51_ > _tmp52_) {
-#line 3495 "simple-scan.c"
-					GString* _tmp53_ = NULL;
-					const gchar* _tmp54_ = NULL;
-					gboolean _tmp55_ = FALSE;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp53_ = line;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp54_ = _tmp53_->str;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp55_ = g_str_has_suffix (_tmp54_, " 0000 n\n");
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp50_ = _tmp55_;
-#line 3507 "simple-scan.c"
-				} else {
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp50_ = FALSE;
-#line 3511 "simple-scan.c"
-				}
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (_tmp50_) {
-#line 3515 "simple-scan.c"
-					FILE* _tmp56_ = NULL;
-					GString* _tmp57_ = NULL;
-					const gchar* _tmp58_ = NULL;
-					gint _tmp59_ = 0;
-					gint _tmp60_ = 0;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp56_ = fixed_file;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp57_ = line;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp58_ = _tmp57_->str;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp59_ = atoi (_tmp58_);
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp60_ = xref_offset;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					fprintf (_tmp56_, "%010d 00000 n \n", _tmp59_ + _tmp60_);
-#line 3533 "simple-scan.c"
-				} else {
-					gboolean _tmp61_ = FALSE;
-					gint _tmp62_ = 0;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp62_ = startxref_line;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (_tmp62_ > 0) {
-#line 3541 "simple-scan.c"
-						gint _tmp63_ = 0;
-						gint _tmp64_ = 0;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp63_ = line_number;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp64_ = startxref_line;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp61_ = _tmp63_ == (_tmp64_ + 1);
-#line 3550 "simple-scan.c"
-					} else {
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp61_ = FALSE;
-#line 3554 "simple-scan.c"
-					}
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (_tmp61_) {
-#line 3558 "simple-scan.c"
-						FILE* _tmp65_ = NULL;
-						GString* _tmp66_ = NULL;
-						const gchar* _tmp67_ = NULL;
-						gint _tmp68_ = 0;
-						gint _tmp69_ = 0;
-						gchar* _tmp70_ = NULL;
-						gchar* _tmp71_ = NULL;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp65_ = fixed_file;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp66_ = line;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp67_ = _tmp66_->str;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp68_ = atoi (_tmp67_);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp69_ = xref_offset;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp70_ = g_strdup_printf ("%d\n", _tmp68_ + _tmp69_);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp71_ = _tmp70_;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						fprintf (_tmp65_, "%s", _tmp71_);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_g_free0 (_tmp71_);
-#line 3584 "simple-scan.c"
-					} else {
-						gboolean _tmp72_ = FALSE;
-						gint _tmp73_ = 0;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp73_ = fixed_size;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (_tmp73_ > 0) {
-#line 3592 "simple-scan.c"
-							GString* _tmp74_ = NULL;
-							const gchar* _tmp75_ = NULL;
-							gboolean _tmp76_ = FALSE;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp74_ = line;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp75_ = _tmp74_->str;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp76_ = g_str_has_prefix (_tmp75_, "/Size ");
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp72_ = _tmp76_;
-#line 3604 "simple-scan.c"
-						} else {
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp72_ = FALSE;
-#line 3608 "simple-scan.c"
-						}
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (_tmp72_) {
-#line 3612 "simple-scan.c"
-							FILE* _tmp77_ = NULL;
-							gint _tmp78_ = 0;
-							gchar* _tmp79_ = NULL;
-							gchar* _tmp80_ = NULL;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp77_ = fixed_file;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp78_ = fixed_size;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp79_ = g_strdup_printf ("/Size %d\n", _tmp78_);
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp80_ = _tmp79_;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							fprintf (_tmp77_, "%s", _tmp80_);
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_g_free0 (_tmp80_);
-#line 3629 "simple-scan.c"
-						} else {
-							gboolean _tmp81_ = FALSE;
-							gint _tmp82_ = 0;
-							gint _tmp83_ = 0;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp82_ = line_number;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp83_ = startxref_line;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							if (_tmp82_ == (_tmp83_ + 2)) {
-#line 3640 "simple-scan.c"
-								GString* _tmp84_ = NULL;
-								const gchar* _tmp85_ = NULL;
-								gboolean _tmp86_ = FALSE;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp84_ = line;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp85_ = _tmp84_->str;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp86_ = g_str_has_prefix (_tmp85_, "%%%%");
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp81_ = _tmp86_;
-#line 3652 "simple-scan.c"
-							} else {
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp81_ = FALSE;
-#line 3656 "simple-scan.c"
-							}
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							if (_tmp81_) {
-#line 3660 "simple-scan.c"
-								FILE* _tmp87_ = NULL;
-								GString* _tmp88_ = NULL;
-								const gchar* _tmp89_ = NULL;
-								gchar* _tmp90_ = NULL;
-								gchar* _tmp91_ = NULL;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp87_ = fixed_file;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp88_ = line;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp89_ = _tmp88_->str;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp90_ = string_substring (_tmp89_, (glong) 2, (glong) -1);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp91_ = _tmp90_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								fprintf (_tmp87_, "%s", _tmp91_);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_g_free0 (_tmp91_);
-#line 3680 "simple-scan.c"
-							} else {
-								{
-									gint i = 0;
-									gint _tmp92_ = 0;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp92_ = offset;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									i = _tmp92_;
-#line 3689 "simple-scan.c"
-									{
-										gboolean _tmp93_ = FALSE;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-										_tmp93_ = TRUE;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-										while (TRUE) {
-#line 3696 "simple-scan.c"
-											gint _tmp95_ = 0;
-											gint _tmp96_ = 0;
-											FILE* _tmp97_ = NULL;
-											gint _tmp98_ = 0;
-											guint8 _tmp99_ = 0U;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-											if (!_tmp93_) {
-#line 3704 "simple-scan.c"
-												gint _tmp94_ = 0;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-												_tmp94_ = i;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-												i = _tmp94_ + 1;
-#line 3710 "simple-scan.c"
-											}
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-											_tmp93_ = FALSE;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-											_tmp95_ = i;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-											_tmp96_ = end_offset;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-											if (!(_tmp95_ < _tmp96_)) {
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-												break;
-#line 3722 "simple-scan.c"
-											}
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-											_tmp97_ = fixed_file;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-											_tmp98_ = i;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-											_tmp99_ = data[_tmp98_];
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-											fputc ((gchar) _tmp99_, _tmp97_);
-#line 3732 "simple-scan.c"
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp100_ = line_number;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		line_number = _tmp100_ + 1;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp101_ = end_offset;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		offset = _tmp101_;
-#line 3750 "simple-scan.c"
-	}
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp102_ = filename;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp103_ = filename;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp104_ = g_strconcat (_tmp103_, "~", NULL);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp105_ = _tmp104_;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp106_ = g_rename (_tmp102_, _tmp105_);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp107_ = _tmp106_ >= 0;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (_tmp105_);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp107_) {
-#line 3768 "simple-scan.c"
-		const gchar* _tmp108_ = NULL;
-		gchar* _tmp109_ = NULL;
-		gchar* _tmp110_ = NULL;
-		const gchar* _tmp111_ = NULL;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp108_ = filename;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp109_ = g_strconcat (_tmp108_, ".fixed", NULL);
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp110_ = _tmp109_;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp111_ = filename;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_rename (_tmp110_, _tmp111_);
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (_tmp110_);
-#line 3785 "simple-scan.c"
-	}
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_string_free0 (line);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_fclose0 (fixed_file);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	data = (g_free (data), NULL);
-#line 3793 "simple-scan.c"
-}
-
-
-static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_log_cb (log_domain, log_levels, message);
-#line 3800 "simple-scan.c"
-}
-
-
-gint simple_scan_main (gchar** args, int args_length1) {
-	gint result = 0;
-	GOptionContext* c = NULL;
-	const gchar* _tmp0_ = NULL;
-	GOptionContext* _tmp1_ = NULL;
-	GOptionContext* _tmp2_ = NULL;
-	GOptionContext* _tmp3_ = NULL;
-	GOptionGroup* _tmp4_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	const gchar* _tmp17_ = NULL;
-	ScanDevice* device = NULL;
-	gchar** _tmp30_ = NULL;
-	gint _tmp30__length1 = 0;
-	GTimer* _tmp40_ = NULL;
-	gchar* path = NULL;
-	const gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	const gchar* _tmp43_ = NULL;
-	const gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	const gchar* _tmp46_ = NULL;
-	FILE* _tmp47_ = NULL;
-	pid_t _tmp48_ = 0;
-	SimpleScan* app = NULL;
-	ScanDevice* _tmp49_ = NULL;
-	SimpleScan* _tmp50_ = NULL;
-	SimpleScan* _tmp51_ = NULL;
-	gint _tmp52_ = 0;
-	GError * _inner_error_ = NULL;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	setlocale (LC_ALL, "");
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	textdomain (GETTEXT_PACKAGE);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = _ ("[DEVICE...] - Scanning utility");
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp1_ = g_option_context_new (_tmp0_);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	c = _tmp1_;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp2_ = c;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_option_context_add_main_entries (_tmp2_, SIMPLE_SCAN_options, GETTEXT_PACKAGE);
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = c;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = gtk_get_option_group (TRUE);
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_option_context_add_group (_tmp3_, _tmp4_);
-#line 3857 "simple-scan.c"
-	{
-		GOptionContext* _tmp5_ = NULL;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp5_ = c;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_option_context_parse (_tmp5_, &args_length1, &args, &_inner_error_);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3866 "simple-scan.c"
-			goto __catch13_g_error;
-		}
-	}
-	goto __finally13;
-	__catch13_g_error:
-	{
-		GError* e = NULL;
-		FILE* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		FILE* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar** _tmp11_ = NULL;
-		gint _tmp11__length1 = 0;
-		const gchar* _tmp12_ = NULL;
-		FILE* _tmp13_ = NULL;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		e = _inner_error_;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_inner_error_ = NULL;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp6_ = stderr;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp7_ = e;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = _tmp7_->message;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		fprintf (_tmp6_, "%s\n", _tmp8_);
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp9_ = stderr;
-#line 631 "/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 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11_ = args;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11__length1 = args_length1;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp12_ = _tmp11_[0];
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		fprintf (_tmp9_, _tmp10_, _tmp12_);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp13_ = stderr;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		fprintf (_tmp13_, "\n");
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = EXIT_FAILURE;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_error_free0 (e);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_option_context_free0 (c);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 3919 "simple-scan.c"
-	}
-	__finally13:
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3924 "simple-scan.c"
-		gint _tmp14_ = 0;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_option_context_free0 (c);
-#line 624 "/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 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_clear_error (&_inner_error_);
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return _tmp14_;
-#line 3934 "simple-scan.c"
-	}
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp15_ = simple_scan_show_version;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp15_) {
-#line 3940 "simple-scan.c"
-		FILE* _tmp16_ = NULL;
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp16_ = stderr;
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		fprintf (_tmp16_, "simple-scan %s\n", VERSION);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = EXIT_SUCCESS;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_option_context_free0 (c);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 3952 "simple-scan.c"
-	}
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp17_ = simple_scan_fix_pdf_filename;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp17_ != NULL) {
-#line 3958 "simple-scan.c"
-		{
-			const gchar* _tmp18_ = NULL;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp18_ = simple_scan_fix_pdf_filename;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			simple_scan_fix_pdf (_tmp18_, &_inner_error_);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3967 "simple-scan.c"
-				goto __catch14_g_error;
-			}
-			{
-				gint i = 0;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				i = 1;
-#line 3974 "simple-scan.c"
-				{
-					gboolean _tmp19_ = FALSE;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp19_ = TRUE;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					while (TRUE) {
-#line 3981 "simple-scan.c"
-						gint _tmp21_ = 0;
-						gchar** _tmp22_ = NULL;
-						gint _tmp22__length1 = 0;
-						gchar** _tmp23_ = NULL;
-						gint _tmp23__length1 = 0;
-						gint _tmp24_ = 0;
-						const gchar* _tmp25_ = NULL;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (!_tmp19_) {
-#line 3991 "simple-scan.c"
-							gint _tmp20_ = 0;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp20_ = i;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							i = _tmp20_ + 1;
-#line 3997 "simple-scan.c"
-						}
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp19_ = FALSE;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp21_ = i;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp22_ = args;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp22__length1 = args_length1;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (!(_tmp21_ < _tmp22__length1)) {
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							break;
-#line 4011 "simple-scan.c"
-						}
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp23_ = args;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp23__length1 = args_length1;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp24_ = i;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp25_ = _tmp23_[_tmp24_];
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						simple_scan_fix_pdf (_tmp25_, &_inner_error_);
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4025 "simple-scan.c"
-							goto __catch14_g_error;
-						}
-					}
-				}
-			}
-		}
-		goto __finally14;
-		__catch14_g_error:
-		{
-			GError* e = NULL;
-			FILE* _tmp26_ = NULL;
-			GError* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			e = _inner_error_;
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_inner_error_ = NULL;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp26_ = stderr;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp27_ = e;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp28_ = _tmp27_->message;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			fprintf (_tmp26_, "Error fixing PDF file: %s", _tmp28_);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			result = EXIT_FAILURE;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_error_free0 (e);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_option_context_free0 (c);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			return result;
-#line 4059 "simple-scan.c"
-		}
-		__finally14:
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4064 "simple-scan.c"
-			gint _tmp29_ = 0;
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_option_context_free0 (c);
-#line 644 "/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 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			g_clear_error (&_inner_error_);
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			return _tmp29_;
-#line 4074 "simple-scan.c"
-		}
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		result = EXIT_SUCCESS;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_option_context_free0 (c);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return result;
-#line 4082 "simple-scan.c"
-	}
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	device = NULL;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp30_ = args;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp30__length1 = args_length1;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp30__length1 > 1) {
-#line 4092 "simple-scan.c"
-		ScanDevice* _tmp31_ = NULL;
-		ScanDevice* _tmp32_ = NULL;
-		gchar** _tmp33_ = NULL;
-		gint _tmp33__length1 = 0;
-		const gchar* _tmp34_ = NULL;
-		gchar* _tmp35_ = NULL;
-		ScanDevice* _tmp36_ = NULL;
-		gchar** _tmp37_ = NULL;
-		gint _tmp37__length1 = 0;
-		const gchar* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp31_ = scan_device_new ();
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_scan_device_unref0 (device);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device = _tmp31_;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp32_ = device;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp33_ = args;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp33__length1 = args_length1;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp34_ = _tmp33_[1];
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp35_ = g_strdup (_tmp34_);
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (_tmp32_->name);
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp32_->name = _tmp35_;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp36_ = device;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp37_ = args;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp37__length1 = args_length1;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp38_ = _tmp37_[1];
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp39_ = g_strdup (_tmp38_);
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (_tmp36_->label);
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp36_->label = _tmp39_;
-#line 4138 "simple-scan.c"
-	}
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp40_ = g_timer_new ();
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_timer_destroy0 (simple_scan_log_timer);
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_log_timer = _tmp40_;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp41_ = g_get_user_cache_dir ();
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp42_ = g_build_filename (_tmp41_, "simple-scan", NULL, NULL);
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	path = _tmp42_;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp43_ = path;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_mkdir_with_parents (_tmp43_, 0700);
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp44_ = g_get_user_cache_dir ();
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp45_ = g_build_filename (_tmp44_, "simple-scan", "simple-scan.log", NULL, NULL);
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (path);
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	path = _tmp45_;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp46_ = path;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp47_ = g_fopen (_tmp46_, "w");
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_fclose0 (simple_scan_log_file);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_log_file = _tmp47_;
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_log_set_default_handler (_simple_scan_log_cb_glog_func, NULL);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp48_ = getpid ();
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:674: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp48_);
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	gtk_init (&args_length1, &args);
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp49_ = device;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp50_ = simple_scan_new (_tmp49_);
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	app = _tmp50_;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp51_ = app;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp52_ = g_application_run ((GApplication*) _tmp51_, 0, NULL);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	result = _tmp52_;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (app);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (path);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_scan_device_unref0 (device);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_option_context_free0 (c);
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	return result;
-#line 4202 "simple-scan.c"
-}
-
-
-int main (int argc, char ** argv) {
-#if !GLIB_CHECK_VERSION (2,35,0)
-	g_type_init ();
-#endif
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	return simple_scan_main (argv, argc);
-#line 4212 "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"
-	((GApplicationClass *) klass)->startup = (void (*)(GApplication*)) simple_scan_real_startup;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	((GApplicationClass *) klass)->activate = (void (*)(GApplication*)) simple_scan_real_activate;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	((GApplicationClass *) klass)->shutdown = (void (*)(GApplication*)) 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 4229 "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 4240 "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->usb_context);
-#line 35 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_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 4260 "simple-scan.c"
-}
-
-
-GType simple_scan_get_type (void) {
-	static volatile gsize simple_scan_type_id__volatile = 0;
-	if (g_once_init_enter (&simple_scan_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (SimpleScanClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) simple_scan_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SimpleScan), 0, (GInstanceInitFunc) simple_scan_instance_init, NULL };
-		GType simple_scan_type_id;
-		simple_scan_type_id = g_type_register_static (gtk_application_get_type (), "SimpleScan", &g_define_type_info, 0);
-		g_once_init_leave (&simple_scan_type_id__volatile, simple_scan_type_id);
-	}
-	return simple_scan_type_id__volatile;
-}
-
-
-
diff --git a/src/simple-scan.gresource.xml b/src/simple-scan.gresource.xml
new file mode 100644
index 0000000..a62619e
--- /dev/null
+++ b/src/simple-scan.gresource.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/SimpleScan">
+    <file preprocess="xml-stripblanks">app-window.ui</file>
+    <file preprocess="xml-stripblanks">preferences-dialog.ui</file>
+    <file preprocess="xml-stripblanks">authorize-dialog.ui</file>
+  </gresource>
+  <gresource prefix="/org/gnome/SimpleScan/gtk">
+    <file preprocess="xml-stripblanks">help-overlay.ui</file>
+  </gresource>
+</gresources>
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index 9d1b9fd..841e702 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -23,7 +23,7 @@ public class SimpleScan : Gtk.Application
           /* Help string for command line --debug flag */
           N_("Print debugging messages"), null},
         { "fix-pdf", 0, 0, OptionArg.STRING, ref fix_pdf_filename,
-          N_("Fix PDF files generated with older versions of Simple Scan"), "FILENAME..."},
+          N_("Fix PDF files generated with older versions of Simple Scan"), "FILENAME…"},
         { null }
     };
     private static Timer log_timer;
@@ -32,12 +32,16 @@ public class SimpleScan : Gtk.Application
     private ScanDevice? default_device = null;
     private bool have_devices = false;
     private GUsb.Context usb_context;
-    private UserInterface ui;
+    private AppWindow app;
     private Scanner scanner;
     private Book book;
 
     public SimpleScan (ScanDevice? device = null)
     {
+        /* The inhibit () method use this */
+        Object (application_id: "org.gnome.SimpleScan");
+        register_session = true;
+
         default_device = device;
     }
 
@@ -45,11 +49,10 @@ public class SimpleScan : Gtk.Application
     {
         base.startup ();
 
-        ui = new UserInterface ();
-        book = ui.book;
-        ui.start_scan.connect (scan_cb);
-        ui.stop_scan.connect (cancel_cb);
-        ui.email.connect (email_cb);
+        app = new AppWindow ();
+        book = app.book;
+        app.start_scan.connect (scan_cb);
+        app.stop_scan.connect (cancel_cb);
 
         scanner = Scanner.get_instance ();
         scanner.update_devices.connect (update_scan_devices_cb);
@@ -78,15 +81,15 @@ public class SimpleScan : Gtk.Application
             List<ScanDevice> device_list = null;
 
             device_list.append (default_device);
-            ui.set_scan_devices (device_list);
-            ui.selected_device = default_device.name;
+            app.set_scan_devices (device_list);
+            app.selected_device = default_device.name;
         }
     }
 
     public override void activate ()
     {
         base.activate ();
-        ui.start ();
+        app.start ();
         scanner.start ();
     }
 
@@ -94,7 +97,7 @@ public class SimpleScan : Gtk.Application
     {
         base.shutdown ();
         book = null;
-        ui = null;
+        app = null;
         usb_context = null;
         scanner.free ();
     }
@@ -127,7 +130,7 @@ public class SimpleScan : Gtk.Application
         if (!have_devices)
             missing_driver = suggest_driver ();
 
-        ui.set_scan_devices (devices_copy, missing_driver);
+        app.set_scan_devices (devices_copy, missing_driver);
     }
     
     /* Taken from /usr/local/Brother/sane/Brsane.ini from brscan driver */
@@ -191,9 +194,7 @@ public class SimpleScan : Gtk.Application
         add_devices (driver_map, samsung_devices, "samsung");
         add_devices (driver_map, hpaio_devices, "hpaio");
         add_devices (driver_map, epkowa_devices, "epkowa");        
-        var devices = GUsb.context_get_devices (usb_context);
-        /* Fixed in GUsb 0.2.7: https://github.com/hughsie/libgusb/commit/83a6b1a20653c1a17f0a909f08652b5e1df44075 */
-        /*var devices = GUSB.context_get_devices (context);*/
+        var devices = usb_context.get_devices ();
         for (var i = 0; i < devices.length; i++)
         {
             var device = devices.data[i];
@@ -214,7 +215,7 @@ public class SimpleScan : Gtk.Application
     private void authorize_cb (Scanner scanner, string resource)
     {
         string username, password;
-        ui.authorize (resource, out username, out password);
+        app.authorize (resource, out username, out password);
         scanner.authorize (username, password);
     }
 
@@ -224,7 +225,7 @@ public class SimpleScan : Gtk.Application
         var page = book.get_page (-1);
         if (page != null && !page.has_data)
         {
-            ui.selected_page = page;
+            app.selected_page = page;
             page.start ();
             return page;
         }
@@ -264,7 +265,7 @@ public class SimpleScan : Gtk.Application
                 page.set_custom_crop (cw, ch);
             page.move_crop (cx, cy);
         }
-        ui.selected_page = page;
+        app.selected_page = page;
         page.start ();
 
         return page;
@@ -281,7 +282,7 @@ public class SimpleScan : Gtk.Application
         var device_id = "sane:%s".printf (device_name);
         debug ("Getting color profile for device %s", device_name);
 
-        var client = new Colord.Client ();
+        var client = new Cd.Client ();
         try
         {
             client.connect_sync ();
@@ -292,10 +293,10 @@ public class SimpleScan : Gtk.Application
             return null;
         }
 
-        Colord.Device device;
+        Cd.Device device;
         try
         {
-            device = client.find_device_by_property_sync (Colord.DEVICE_PROPERTY_SERIAL, device_id);
+            device = client.find_device_by_property_sync (Cd.DEVICE_PROPERTY_SERIAL, device_id);
         }
         catch (Error e)
         {
@@ -387,118 +388,80 @@ public class SimpleScan : Gtk.Application
         remove_empty_page ();
         if (error_code != Sane.Status.CANCELLED)
         {
-            ui.show_error (/* Title of error dialog when scan failed */
-                           _("Failed to scan"),
-                           error_string,
-                           have_devices);
+            app.show_error_dialog (/* Title of error dialog when scan failed */
+                                   _("Failed to scan"),
+                                   error_string);
         }
     }
 
-    private void scanner_scanning_changed_cb (Scanner scanner)
-    {
-        ui.scanning = scanner.is_scanning ();
-    }
-
-    private void scan_cb (UserInterface ui, string? device, ScanOptions options)
-    {
-        debug ("Requesting scan at %d dpi from device '%s'", options.dpi, device);
+    private uint inhibit_cookie;
+    private FreedesktopScreensaver? fdss;
 
-        if (!scanner.is_scanning ())
-            append_page ();
-
-        scanner.scan (device, options);
-    }
-
-    private void cancel_cb (UserInterface ui)
-    {
-        scanner.cancel ();
-    }
-
-    private string? get_temporary_filename (string prefix, string extension)
+    private void scanner_scanning_changed_cb (Scanner scanner)
     {
-        /* NOTE: I'm not sure if this is a 100% safe strategy to use g_file_open_tmp(), close and
-         * use the filename but it appears to work in practise */
+        var is_scanning = scanner.is_scanning ();
 
-        var filename = "%sXXXXXX.%s".printf (prefix, extension);
-        string path;
-        try
-        {
-            var fd = FileUtils.open_tmp (filename, out path);
-            Posix.close (fd);
-        }
-        catch (Error e)
+        if (is_scanning)
         {
-            warning ("Error saving email attachment: %s", e.message);
-            return null;
-        }
+            /* Attempt to inhibit the screensaver when scanning */
+            var reason = _("Scan in progress");
 
-        return path;
-    }
+            /* This should work on Gnome, Budgie, Cinnamon, Mate, Unity, ...
+             * but will not work on KDE, LXDE, XFCE, ... */
+            inhibit_cookie = inhibit (app, Gtk.ApplicationInhibitFlags.IDLE, reason);
 
-    private void email_cb (UserInterface ui, string profile, int quality)
-    {
-        var saved = false;
-        var command_line = "xdg-email";
-
-        /* Save text files as PDFs */
-        if (profile == "text")
-        {
-            /* Open a temporary file */
-            var path = get_temporary_filename ("scan", "pdf");
-            if (path != null)
+            if (!is_inhibited (Gtk.ApplicationInhibitFlags.IDLE))
             {
-                var file = File.new_for_path (path);
-                ui.show_progress_dialog ();
+                /* If the previous method didn't work, try the one
+                 * provided by Freedesktop. It should work with KDE,
+                 * LXDE, XFCE, and maybe others as well. */
                 try
                 {
-                    book.save ("pdf", quality, file);
+                    if ((fdss = FreedesktopScreensaver.get_proxy ()) != null)
+                    {
+                        inhibit_cookie = fdss.inhibit ("Simple-Scan", reason);
+                    }
                 }
-                catch (Error e)
-                {
-                    ui.hide_progress_dialog ();
-                    warning ("Unable to save email file: %s", e.message);
-                    return;
-                }
-                command_line += " --attach %s".printf (path);
+                catch (IOError error) {}
             }
         }
         else
         {
-            for (var i = 0; i < book.n_pages; i++)
+            /* When finished scanning, uninhibit if inhibit was working */
+            if (inhibit_cookie != 0)
             {
-                var path = get_temporary_filename ("scan", "jpg");
-                if (path == null)
-                {
-                    saved = false;
-                    break;
-                }
-
-                var file = File.new_for_path (path);
-                try
-                {
-                    book.get_page (i).save ("jpeg", quality, file);
-                }
-                catch (Error e)
+                if (fdss == null)
+                        uninhibit (inhibit_cookie);
+                else
                 {
-                    warning ("Unable to save email file: %s", e.message);
-                    return;
+                    try
+                    {
+                        fdss.uninhibit (inhibit_cookie);
+                    }
+                    catch (IOError error) {}
+                    fdss = null;
                 }
-                command_line += " --attach %s".printf (path);
 
-                if (!saved)
-                    break;
+                inhibit_cookie = 0;
             }
         }
 
-        debug ("Launching email client: %s", command_line);
-        try
-        {
-            Process.spawn_command_line_async (command_line);
-        }
-        catch (Error e)
-        {
-            warning ("Unable to start email: %s", e.message);
-        }
+        app.scanning = is_scanning;
+    }
+
+    private void scan_cb (AppWindow ui, string? device, ScanOptions options)
+    {
+        debug ("Requesting scan at %d dpi from device '%s'", options.dpi, device);
+
+        if (!scanner.is_scanning ())
+            append_page ();
+
+        scanner.scan (device, options);
+    }
+
+    private void cancel_cb (AppWindow ui)
+    {
+        scanner.cancel ();
     }
 
     private static void log_cb (string? log_domain, LogLevelFlags log_level, string message)
@@ -618,7 +581,7 @@ public class SimpleScan : Gtk.Application
         Intl.textdomain (GETTEXT_PACKAGE);
 
         var c = new OptionContext (/* Arguments and description for --help text */
-                                   _("[DEVICE...] - Scanning utility"));
+                                   _("[DEVICE…] — Scanning utility"));
         c.add_main_entries (options, GETTEXT_PACKAGE);
         c.add_group (Gtk.get_option_group (true));
         try
@@ -629,7 +592,7 @@ public class SimpleScan : Gtk.Application
         {
             stderr.printf ("%s\n", e.message);
             stderr.printf (/* Text printed out when an unknown command-line argument provided */
-                           _("Run '%s --help' to see a full list of available command line options."), args[0]);
+                           _("Run “%s --help” to see a full list of available command line options."), args[0]);
             stderr.printf ("\n");
             return Posix.EXIT_FAILURE;
         }
diff --git a/src/simple_scan_vala.stamp b/src/simple_scan_vala.stamp
deleted file mode 100644
index 859afb1..0000000
--- a/src/simple_scan_vala.stamp
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/src/ui.c b/src/ui.c
deleted file mode 100644
index 3d687d9..0000000
--- a/src/ui.c
+++ /dev/null
@@ -1,13000 +0,0 @@
-/* ui.c generated by valac 0.34.6, the Vala compiler
- * generated from ui.vala, do not modify */
-
-/*
- * Copyright (C) 2009-2015 Canonical Ltd.
- * Author: Robert Ancell <robert.ancell@canonical.com>,
- *         Eduard Gotwig <g@ox.io>
- *
- * 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.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gdk/gdk.h>
-#include <glib/gi18n-lib.h>
-#include <float.h>
-#include <math.h>
-#include <cairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "packagekit-glib2/packagekit.h"
-#include <glib/gstdio.h>
-#include <unistd.h>
-
-
-#define TYPE_USER_INTERFACE (user_interface_get_type ())
-#define USER_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_USER_INTERFACE, UserInterface))
-#define USER_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_USER_INTERFACE, UserInterfaceClass))
-#define IS_USER_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_USER_INTERFACE))
-#define IS_USER_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_USER_INTERFACE))
-#define USER_INTERFACE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_USER_INTERFACE, UserInterfaceClass))
-
-typedef struct _UserInterface UserInterface;
-typedef struct _UserInterfaceClass UserInterfaceClass;
-typedef struct _UserInterfacePrivate UserInterfacePrivate;
-
-#define TYPE_PROGRESS_BAR_DIALOG (progress_bar_dialog_get_type ())
-#define PROGRESS_BAR_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog))
-#define PROGRESS_BAR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialogClass))
-#define IS_PROGRESS_BAR_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROGRESS_BAR_DIALOG))
-#define IS_PROGRESS_BAR_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROGRESS_BAR_DIALOG))
-#define PROGRESS_BAR_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialogClass))
-
-typedef struct _ProgressBarDialog ProgressBarDialog;
-typedef struct _ProgressBarDialogClass ProgressBarDialogClass;
-
-#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_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))
-#define IS_BOOK_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_BOOK_VIEW))
-#define IS_BOOK_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_BOOK_VIEW))
-#define BOOK_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_BOOK_VIEW, BookViewClass))
-
-typedef struct _BookView BookView;
-typedef struct _BookViewClass BookViewClass;
-
-#define TYPE_SCAN_DIRECTION (scan_direction_get_type ())
-
-#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 _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 _page_unref0(var) ((var == NULL) ? NULL : (var = (page_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))
-#define SCAN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_DEVICE, ScanDeviceClass))
-#define IS_SCAN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_DEVICE))
-#define IS_SCAN_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_DEVICE))
-#define SCAN_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_DEVICE, ScanDeviceClass))
-
-typedef struct _ScanDevice ScanDevice;
-typedef struct _ScanDeviceClass ScanDeviceClass;
-typedef struct _ScanDevicePrivate ScanDevicePrivate;
-#define _scan_device_unref0(var) ((var == NULL) ? NULL : (var = (scan_device_unref (var), NULL)))
-typedef struct _Block1Data Block1Data;
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-
-#define TYPE_SCAN_TYPE (scan_type_get_type ())
-
-#define TYPE_SCAN_OPTIONS (scan_options_get_type ())
-#define SCAN_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_OPTIONS, ScanOptions))
-#define SCAN_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_OPTIONS, ScanOptionsClass))
-#define IS_SCAN_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_OPTIONS))
-#define IS_SCAN_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_OPTIONS))
-#define SCAN_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_OPTIONS, ScanOptionsClass))
-
-typedef struct _ScanOptions ScanOptions;
-typedef struct _ScanOptionsClass ScanOptionsClass;
-
-#define TYPE_SCAN_MODE (scan_mode_get_type ())
-typedef struct _ScanOptionsPrivate ScanOptionsPrivate;
-#define _scan_options_unref0(var) ((var == NULL) ? NULL : (var = (scan_options_unref (var), NULL)))
-typedef struct _Block2Data Block2Data;
-
-#define TYPE_PAGE_ICON (page_icon_get_type ())
-#define PAGE_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_ICON, PageIcon))
-#define PAGE_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_ICON, PageIconClass))
-#define IS_PAGE_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_ICON))
-#define IS_PAGE_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_ICON))
-#define PAGE_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_ICON, PageIconClass))
-
-typedef struct _PageIcon PageIcon;
-typedef struct _PageIconClass PageIconClass;
-#define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
-typedef struct _Block3Data Block3Data;
-#define _g_ptr_array_unref0(var) ((var == NULL) ? NULL : (var = (g_ptr_array_unref (var), NULL)))
-typedef struct _UserInterfaceInstallPackagesData UserInterfaceInstallPackagesData;
-#define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL)))
-typedef struct _ProgressBarDialogPrivate ProgressBarDialogPrivate;
-typedef struct _PageIconPrivate PageIconPrivate;
-
-struct _UserInterface {
-	GtkApplicationWindow parent_instance;
-	UserInterfacePrivate * priv;
-};
-
-struct _UserInterfaceClass {
-	GtkApplicationWindowClass parent_class;
-};
-
-typedef enum  {
-	SCAN_DIRECTION_TOP_TO_BOTTOM,
-	SCAN_DIRECTION_LEFT_TO_RIGHT,
-	SCAN_DIRECTION_BOTTOM_TO_TOP,
-	SCAN_DIRECTION_RIGHT_TO_LEFT
-} ScanDirection;
-
-struct _UserInterfacePrivate {
-	GSettings* settings;
-	GtkMenuBar* menubar;
-	GtkToolbar* toolbar;
-	GtkMenu* page_menu;
-	GtkBox* main_vbox;
-	GtkInfoBar* info_bar;
-	GtkImage* info_bar_image;
-	GtkLabel* info_bar_label;
-	GtkButton* info_bar_close_button;
-	GtkButton* info_bar_change_scanner_button;
-	GtkButton* info_bar_install_button;
-	GtkRadioMenuItem* custom_crop_menuitem;
-	GtkRadioMenuItem* a4_menuitem;
-	GtkRadioMenuItem* a5_menuitem;
-	GtkRadioMenuItem* a6_menuitem;
-	GtkRadioMenuItem* letter_menuitem;
-	GtkRadioMenuItem* legal_menuitem;
-	GtkRadioMenuItem* four_by_six_menuitem;
-	GtkRadioMenuItem* no_crop_menuitem;
-	GtkMenuItem* page_move_left_menuitem;
-	GtkMenuItem* page_move_right_menuitem;
-	GtkMenuItem* page_delete_menuitem;
-	GtkMenuItem* crop_rotate_menuitem;
-	GtkMenuItem* save_menuitem;
-	GtkMenuItem* save_as_menuitem;
-	GtkMenuItem* copy_to_clipboard_menuitem;
-	GtkButton* save_button;
-	GtkToolButton* save_toolbutton;
-	GtkMenuItem* stop_scan_menuitem;
-	GtkToolButton* stop_toolbutton;
-	GtkToggleButton* crop_button;
-	GtkToggleToolButton* crop_toolbutton;
-	GtkButton* stop_button;
-	GtkButton* scan_button;
-	GtkRadioMenuItem* text_button_menuitem;
-	GtkRadioMenuItem* text_button_hb_menuitem;
-	GtkRadioMenuItem* text_menuitem;
-	GtkRadioMenuItem* photo_button_menuitem;
-	GtkRadioMenuItem* photo_button_hb_menuitem;
-	GtkRadioMenuItem* photo_menuitem;
-	GtkDialog* authorize_dialog;
-	GtkLabel* authorize_label;
-	GtkEntry* username_entry;
-	GtkEntry* password_entry;
-	GtkDialog* preferences_dialog;
-	GtkComboBox* device_combo;
-	GtkComboBox* text_dpi_combo;
-	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;
-	gchar* missing_driver;
-	gboolean user_selected_device;
-	GtkFileChooserDialog* save_dialog;
-	ProgressBarDialog* progress_dialog;
-	gboolean have_error;
-	gchar* error_title;
-	gchar* error_text;
-	gboolean error_change_scanner_hint;
-	Book* _book;
-	gchar* book_uri;
-	AutosaveManager* autosave_manager;
-	BookView* book_view;
-	gboolean updating_page_menu;
-	gint default_page_width;
-	gint default_page_height;
-	gint default_page_dpi;
-	ScanDirection default_page_scan_direction;
-	gchar* document_hint;
-	gboolean scanning_;
-	gint window_width;
-	gint window_height;
-	gboolean window_is_maximized;
-	gboolean window_is_fullscreen;
-	guint save_state_timeout;
-};
-
-struct _ScanDevice {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanDevicePrivate * priv;
-	gchar* name;
-	gchar* label;
-};
-
-struct _ScanDeviceClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanDevice *self);
-};
-
-struct _Block1Data {
-	int _ref_count_;
-	UserInterface* self;
-	GtkListStore* file_type_store;
-	GtkComboBox* file_type_combo;
-};
-
-typedef enum  {
-	SCAN_TYPE_SINGLE,
-	SCAN_TYPE_ADF_FRONT,
-	SCAN_TYPE_ADF_BACK,
-	SCAN_TYPE_ADF_BOTH
-} ScanType;
-
-typedef enum  {
-	SCAN_MODE_DEFAULT,
-	SCAN_MODE_COLOR,
-	SCAN_MODE_GRAY,
-	SCAN_MODE_LINEART
-} ScanMode;
-
-struct _ScanOptions {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanOptionsPrivate * priv;
-	gint dpi;
-	ScanMode scan_mode;
-	gint depth;
-	ScanType type;
-	gint paper_width;
-	gint paper_height;
-	gint brightness;
-	gint contrast;
-};
-
-struct _ScanOptionsClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanOptions *self);
-};
-
-struct _Block2Data {
-	int _ref_count_;
-	UserInterface* self;
-	GtkWindow* dialog;
-};
-
-struct _Block3Data {
-	int _ref_count_;
-	UserInterface* self;
-	GtkStack* stack;
-	GtkSpinner* spinner;
-	GtkLabel* status_label;
-	GtkLabel* instructions_label;
-};
-
-struct _UserInterfaceInstallPackagesData {
-	int _state_;
-	GObject* _source_object_;
-	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
-	UserInterface* self;
-	gchar** packages;
-	gint packages_length1;
-	PkProgressCallback progress_callback;
-	gpointer progress_callback_target;
-	PkResults* result;
-	PkTask* task;
-	PkTask* _tmp0_;
-	PkResults* results;
-	PkResults* _tmp1_;
-	PkTask* _tmp2_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-	PkProgressCallback _tmp4_;
-	void* _tmp4__target;
-	PkResults* _tmp5_;
-	PkResults* _tmp6_;
-	gboolean _tmp7_;
-	PkResults* _tmp8_;
-	PkResults* _tmp9_;
-	PkError* _tmp10_;
-	PkError* _tmp11_;
-	GPtrArray* package_array;
-	PkResults* _tmp12_;
-	GPtrArray* _tmp13_;
-	gchar** package_ids;
-	GPtrArray* _tmp14_;
-	gint _tmp15_;
-	gint _tmp16_;
-	gchar** _tmp17_;
-	gint package_ids_length1;
-	gint _package_ids_size_;
-	gchar** _tmp18_;
-	gint _tmp18__length1;
-	GPtrArray* _tmp19_;
-	gint _tmp20_;
-	gint _tmp21_;
-	gchar* _tmp22_;
-	gint i;
-	gboolean _tmp23_;
-	gint _tmp24_;
-	gint _tmp25_;
-	GPtrArray* _tmp26_;
-	gint _tmp27_;
-	gint _tmp28_;
-	gchar** _tmp29_;
-	gint _tmp29__length1;
-	gint _tmp30_;
-	GPtrArray* _tmp31_;
-	gpointer* _tmp32_;
-	gint _tmp32__length1;
-	gint _tmp33_;
-	PkPackage* _tmp34_;
-	const gchar* _tmp35_;
-	gchar* _tmp36_;
-	gchar* _tmp37_;
-	PkResults* _tmp38_;
-	PkTask* _tmp39_;
-	gchar** _tmp40_;
-	gint _tmp40__length1;
-	PkProgressCallback _tmp41_;
-	void* _tmp41__target;
-	PkResults* _tmp42_;
-	PkResults* _tmp43_;
-	GError * _inner_error_;
-};
-
-struct _ProgressBarDialog {
-	GtkWindow parent_instance;
-	ProgressBarDialogPrivate * priv;
-};
-
-struct _ProgressBarDialogClass {
-	GtkWindowClass parent_class;
-};
-
-struct _ProgressBarDialogPrivate {
-	GtkProgressBar* bar;
-};
-
-struct _PageIcon {
-	GtkDrawingArea parent_instance;
-	PageIconPrivate * priv;
-};
-
-struct _PageIconClass {
-	GtkDrawingAreaClass parent_class;
-};
-
-struct _PageIconPrivate {
-	gchar* text;
-	gdouble r;
-	gdouble g;
-	gdouble b;
-};
-
-
-static gpointer user_interface_parent_class = NULL;
-static gpointer progress_bar_dialog_parent_class = NULL;
-static gpointer page_icon_parent_class = NULL;
-
-GType user_interface_get_type (void) G_GNUC_CONST;
-GType progress_bar_dialog_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 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))
-enum  {
-	USER_INTERFACE_DUMMY_PROPERTY,
-	USER_INTERFACE_BOOK,
-	USER_INTERFACE_SELECTED_PAGE,
-	USER_INTERFACE_SCANNING,
-	USER_INTERFACE_BRIGHTNESS,
-	USER_INTERFACE_CONTRAST,
-	USER_INTERFACE_QUALITY,
-	USER_INTERFACE_SELECTED_DEVICE
-};
-Book* user_interface_get_book (UserInterface* self);
-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;
-static void user_interface_page_added_cb (UserInterface* self, Book* book, Page* page);
-static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self);
-static void user_interface_reordered_cb (UserInterface* self, Book* book);
-static void _user_interface_reordered_cb_book_reordered (Book* _sender, gpointer self);
-static void user_interface_page_removed_cb (UserInterface* self, Book* book, Page* page);
-static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self);
-#define USER_INTERFACE_DEFAULT_TEXT_DPI 150
-#define USER_INTERFACE_DEFAULT_PHOTO_DPI 300
-void user_interface_new_document_activate_cb (UserInterface* self);
-static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void user_interface_reorder_document_activate_cb (UserInterface* self);
-static void _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void user_interface_save_document_activate_cb (UserInterface* self);
-static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void user_interface_save_as_document_activate_cb (UserInterface* self);
-static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void user_interface_email_document_activate_cb (UserInterface* self);
-static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void user_interface_print_document_activate_cb (UserInterface* self);
-static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void user_interface_preferences_activate_cb (UserInterface* self);
-static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void user_interface_help_contents_activate_cb (UserInterface* self);
-static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void user_interface_about_activate_cb (UserInterface* self);
-static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void user_interface_quit_activate_cb (UserInterface* self);
-static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-UserInterface* user_interface_new (void);
-UserInterface* user_interface_construct (GType object_type);
-Book* book_new (void);
-Book* book_construct (GType object_type);
-static void user_interface_set_book (UserInterface* self, Book* value);
-static void user_interface_needs_saving_cb (UserInterface* self, Book* book);
-static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self);
-static void user_interface_load (UserInterface* self);
-AutosaveManager* autosave_manager_new (void);
-AutosaveManager* autosave_manager_construct (GType object_type);
-void autosave_manager_set_book (AutosaveManager* self, Book* value);
-void autosave_manager_load (AutosaveManager* self);
-guint book_get_n_pages (Book* self);
-static void user_interface_add_default_page (UserInterface* self);
-void book_set_needs_saving (Book* self, gboolean value);
-Page* book_get_page (Book* self, gint page_number);
-void book_view_set_selected_page (BookView* self, Page* value);
-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_authorize (UserInterface* self, const gchar* resource, gchar** username, gchar** password);
-static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidget* widget);
-gchar* user_interface_get_selected_device (UserInterface* self);
-static void _user_interface_device_combo_changed_cb_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void user_interface_update_info_bar (UserInterface* self);
-gpointer scan_device_ref (gpointer instance);
-void scan_device_unref (gpointer instance);
-GParamSpec* param_spec_scan_device (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scan_device (GValue* value, gpointer v_object);
-void value_take_scan_device (GValue* value, gpointer v_object);
-gpointer value_get_scan_device (const GValue* value);
-GType scan_device_get_type (void) G_GNUC_CONST;
-void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gchar* missing_driver);
-Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction);
-Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction);
-void book_append_page (Book* self, Page* page);
-static gchar* user_interface_choose_file_location (UserInterface* self);
-static Block1Data* block1_data_ref (Block1Data* _data1_);
-static void block1_data_unref (void * _userdata_);
-static void __lambda5_ (Block1Data* _data1_);
-static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _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, gint quality, GFile* file, GError** error);
-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);
-static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* title, const gchar* discard_label);
-gboolean book_get_needs_saving (Book* self);
-static void user_interface_clear_document (UserInterface* self);
-void book_clear (Book* self);
-static void user_interface_new_document (UserInterface* self);
-gboolean user_interface_get_scanning (UserInterface* self);
-static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_new_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void user_interface_set_document_hint (UserInterface* self, const gchar* document_hint, gboolean save);
-static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-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 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);
-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);
-void value_set_scan_options (GValue* value, gpointer v_object);
-void value_take_scan_options (GValue* value, gpointer v_object);
-gpointer value_get_scan_options (const GValue* value);
-GType scan_options_get_type (void) G_GNUC_CONST;
-static ScanOptions* user_interface_make_scan_options (UserInterface* self);
-ScanOptions* scan_options_new (void);
-ScanOptions* scan_options_construct (GType object_type);
-GType scan_mode_get_type (void) G_GNUC_CONST;
-gint user_interface_get_brightness (UserInterface* self);
-gint user_interface_get_contrast (UserInterface* self);
-static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void user_interface_continuous_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_preferences_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event);
-static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
-static void user_interface_preferences_dialog_response_cb (UserInterface* self, GtkWidget* widget, gint response_id);
-static void _user_interface_preferences_dialog_response_cb_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
-static void user_interface_update_page_menu (UserInterface* self);
-Page* book_view_get_selected_page (BookView* self);
-guint book_get_page_index (Book* self, Page* page);
-static void user_interface_page_selected_cb (UserInterface* self, BookView* view, Page* page);
-gboolean page_get_has_crop (Page* self);
-const gchar* page_get_crop_name (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, gint quality, GFile* file, GError** error);
-static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view);
-static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-void page_rotate_left (Page* self);
-static void _user_interface_rotate_left_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void user_interface_rotate_right_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-void page_rotate_right (Page* self);
-static void _user_interface_rotate_right_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void user_interface_set_crop (UserInterface* self, const gchar* crop_name);
-void page_set_no_crop (Page* self);
-gint page_get_width (Page* self);
-gint page_get_height (Page* self);
-void page_set_custom_crop (Page* self, gint width, gint height);
-void page_move_crop (Page* self, gint x, gint y);
-void page_set_named_crop (Page* self, const gchar* name);
-static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggleButton* widget);
-static void _user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkToggleToolButton* widget);
-static void _user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
-static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
-static void _user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
-void page_rotate_crop (Page* self);
-static void _user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
-void book_move_page (Book* self, Page* page, guint location);
-static void _user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_page_move_right_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
-Book* book_view_get_book (BookView* self);
-void book_delete_page (Book* self, Page* page);
-static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_reorder_document (UserInterface* self);
-static Block2Data* block2_data_ref (Block2Data* _data2_);
-static void block2_data_unref (void * _userdata_);
-static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e);
-static gboolean ___lambda6__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
-static GtkButton* user_interface_make_reorder_button (UserInterface* self, const gchar* text, const gchar* items);
-static void __lambda7_ (Block2Data* _data2_);
-void book_combine_sides (Book* self);
-static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda8_ (Block2Data* _data2_);
-void book_combine_sides_reverse (Book* self);
-static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda9_ (Block2Data* _data2_);
-void book_reverse (Book* self);
-static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda10_ (Block2Data* _data2_);
-static void ___lambda10__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar* items);
-GType page_icon_get_type (void) G_GNUC_CONST;
-PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b);
-PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r, gdouble g, gdouble b);
-static void user_interface_save_file_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_save_file_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-void page_copy_to_clipboard (Page* self, GtkWindow* window);
-static void _user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* operation, GtkPrintContext* print_context, gint page_number);
-gboolean page_get_is_landscape (Page* self);
-gint page_get_dpi (Page* self);
-GdkPixbuf* page_get_image (Page* self, gboolean apply_crop);
-static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_email_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_print_document (UserInterface* self);
-static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self);
-static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_print_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_launch_help (UserInterface* self);
-static void user_interface_help_contents_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_show_about (UserInterface* self);
-static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_about_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static gboolean user_interface_on_quit (UserInterface* self);
-static void user_interface_save_state (UserInterface* self, gboolean force);
-void autosave_manager_cleanup (AutosaveManager* self);
-static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
-static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void user_interface_real_size_allocate (GtkWidget* base, GtkAllocation* allocation);
-static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id);
-static void user_interface_install_drivers (UserInterface* self);
-static Block3Data* block3_data_ref (Block3Data* _data3_);
-static void block3_data_unref (void * _userdata_);
-static void user_interface_install_packages (UserInterface* self, gchar** packages, int packages_length1, PkProgressCallback progress_callback, void* progress_callback_target, GAsyncReadyCallback _callback_, gpointer _user_data_);
-static PkResults* user_interface_install_packages_finish (UserInterface* self, GAsyncResult* _res_, GError** error);
-static void ___lambda12_ (UserInterface* self);
-static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self);
-static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _result_);
-static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self);
-static void user_interface_install_packages_data_free (gpointer _data);
-static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_);
-static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
-static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEventWindowState* event);
-static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event);
-static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
-static void user_interface_page_size_changed_cb (UserInterface* self, Page* page);
-static void user_interface_page_scan_direction_changed_cb (UserInterface* self, Page* page);
-ScanDirection page_get_scan_direction (Page* self);
-static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self);
-static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self);
-static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* combo, gint default_dpi, gint current_dpi);
-static gboolean user_interface_is_traditional_desktop (UserInterface* self);
-static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self);
-static void __lambda14_ (UserInterface* self);
-static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void __lambda15_ (UserInterface* self);
-static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void __lambda16_ (UserInterface* self);
-static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void __lambda17_ (UserInterface* self);
-static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-void user_interface_set_brightness (UserInterface* self, gint value);
-static void __lambda18_ (UserInterface* self);
-static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-void user_interface_set_contrast (UserInterface* self, gint value);
-static void __lambda19_ (UserInterface* self);
-static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-void user_interface_set_quality (UserInterface* self, gint value);
-static void __lambda20_ (UserInterface* self);
-static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-BookView* book_view_new (Book* book);
-BookView* book_view_construct (GType object_type, Book* book);
-static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self);
-static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self);
-static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self);
-static void user_interface_load_state (UserInterface* self);
-ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title);
-ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicationWindow* 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 user_interface_is_desktop (UserInterface* self, const gchar* name);
-static gchar* user_interface_get_state_filename (UserInterface* self);
-static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gint _default_);
-static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gboolean _default_);
-static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_);
-static gboolean ___lambda11_ (UserInterface* self);
-static gboolean ____lambda11__gsource_func (gpointer self);
-static gboolean ___lambda21_ (UserInterface* self);
-static gboolean ____lambda21__gsource_func (gpointer self);
-void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value);
-void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value);
-void user_interface_start (UserInterface* self);
-Page* user_interface_get_selected_page (UserInterface* self);
-void user_interface_set_selected_page (UserInterface* self, Page* value);
-void user_interface_set_scanning (UserInterface* self, gboolean value);
-void user_interface_set_selected_device (UserInterface* self, const gchar* value);
-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 (GObject* obj);
-static void _vala_user_interface_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_user_interface_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-#define PROGRESS_BAR_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialogPrivate))
-enum  {
-	PROGRESS_BAR_DIALOG_DUMMY_PROPERTY,
-	PROGRESS_BAR_DIALOG_FRACTION,
-	PROGRESS_BAR_DIALOG_MESSAGE
-};
-gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self);
-const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self);
-static void progress_bar_dialog_finalize (GObject* obj);
-static void _vala_progress_bar_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_progress_bar_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-#define PAGE_ICON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PAGE_ICON, PageIconPrivate))
-enum  {
-	PAGE_ICON_DUMMY_PROPERTY
-};
-#define PAGE_ICON_MINIMUM_WIDTH 20
-static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_width, gint* natural_width);
-static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_height, gint* natural_height);
-static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint width, gint* minimum_height, gint* natural_height);
-static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint height, gint* minimum_width, gint* natural_width);
-static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c);
-static void page_icon_finalize (GObject* 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 gint _vala_array_length (gpointer array);
-
-static const GActionEntry USER_INTERFACE_action_entries[10] = {{"new_document", _user_interface_new_document_activate_cb_gsimple_action_activate_callback}, {"reorder", _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback}, {"save", _user_interface_save_document_activate_cb_gsimple_action_activate_callback}, {"save_as", _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback}, {"email", _user_interface_email_document_activate_cb_gsimple_action_activate_callback}, {"print", _user_interface_print_document_activate_cb_gsimple_action_activate_callback}, {"preferences", _user_interface_preferences_activate_cb_gsimple_action_activate_callback}, {"help", _user_interface_help_contents_activate_cb_gsimple_action_activate_callback}, {"about", _user_interface_about_activate_cb_gsimple_action_activate_callback}, {"quit", _user_interface_quit_activate_cb_gsimple_action_activate_callback}};
-
-static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_added_cb ((UserInterface*) self, _sender, page);
-#line 795 "ui.c"
-}
-
-
-static void _user_interface_reordered_cb_book_reordered (Book* _sender, gpointer self) {
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_reordered_cb ((UserInterface*) self, _sender);
-#line 802 "ui.c"
-}
-
-
-static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_removed_cb ((UserInterface*) self, _sender, page);
-#line 809 "ui.c"
-}
-
-
-static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_new_document_activate_cb ((UserInterface*) self);
-#line 816 "ui.c"
-}
-
-
-static void _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_reorder_document_activate_cb ((UserInterface*) self);
-#line 823 "ui.c"
-}
-
-
-static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_document_activate_cb ((UserInterface*) self);
-#line 830 "ui.c"
-}
-
-
-static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_as_document_activate_cb ((UserInterface*) self);
-#line 837 "ui.c"
-}
-
-
-static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_email_document_activate_cb ((UserInterface*) self);
-#line 844 "ui.c"
-}
-
-
-static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_print_document_activate_cb ((UserInterface*) self);
-#line 851 "ui.c"
-}
-
-
-static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_preferences_activate_cb ((UserInterface*) self);
-#line 858 "ui.c"
-}
-
-
-static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_help_contents_activate_cb ((UserInterface*) self);
-#line 865 "ui.c"
-}
-
-
-static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_about_activate_cb ((UserInterface*) self);
-#line 872 "ui.c"
-}
-
-
-static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_quit_activate_cb ((UserInterface*) self);
-#line 879 "ui.c"
-}
-
-
-static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_needs_saving_cb ((UserInterface*) self, _sender);
-#line 886 "ui.c"
-}
-
-
-UserInterface* user_interface_construct (GType object_type) {
-	UserInterface * self = NULL;
-	GSettings* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-	Book* _tmp2_ = NULL;
-	Book* _tmp3_ = NULL;
-	Book* _tmp4_ = NULL;
-	Book* _tmp5_ = NULL;
-	Book* _tmp6_ = NULL;
-	AutosaveManager* _tmp7_ = NULL;
-	AutosaveManager* _tmp8_ = NULL;
-	Book* _tmp9_ = NULL;
-	AutosaveManager* _tmp10_ = NULL;
-	Book* _tmp11_ = NULL;
-	guint _tmp12_ = 0U;
-	guint _tmp13_ = 0U;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (UserInterface*) g_object_new (object_type, NULL);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = g_settings_new ("org.gnome.SimpleScan");
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->settings);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->settings = _tmp0_;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_new ();
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_book (self, _tmp2_);
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_book_unref0 (_tmp2_);
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->_book;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp3_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self, 0);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->_book;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp4_, "reordered", (GCallback) _user_interface_reordered_cb_book_reordered, self, 0);
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = self->priv->_book;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp5_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self, 0);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = self->priv->_book;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp6_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self, 0);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_load (self);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = autosave_manager_new ();
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->autosave_manager = _tmp7_;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = self->priv->autosave_manager;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = self->priv->_book;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	autosave_manager_set_book (_tmp8_, _tmp9_);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = self->priv->autosave_manager;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	autosave_manager_load (_tmp10_);
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = self->priv->_book;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = book_get_n_pages (_tmp11_);
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = _tmp12_;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp13_ == ((guint) 0)) {
-#line 964 "ui.c"
-		Book* _tmp14_ = NULL;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_add_default_page (self);
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = self->priv->_book;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_set_needs_saving (_tmp14_, FALSE);
-#line 972 "ui.c"
-	} else {
-		BookView* _tmp15_ = NULL;
-		Book* _tmp16_ = NULL;
-		Page* _tmp17_ = NULL;
-		Page* _tmp18_ = NULL;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = self->priv->book_view;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = self->priv->_book;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = book_get_page (_tmp16_, 0);
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp18_ = _tmp17_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_view_set_selected_page (_tmp15_, _tmp18_);
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_page_unref0 (_tmp18_);
-#line 990 "ui.c"
-	}
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self;
-#line 994 "ui.c"
-}
-
-
-UserInterface* user_interface_new (void) {
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return user_interface_construct (TYPE_USER_INTERFACE);
-#line 1001 "ui.c"
-}
-
-
-static gboolean user_interface_find_scan_device (UserInterface* self, const gchar* device, GtkTreeIter* iter) {
-	GtkTreeIter _vala_iter = {0};
-	gboolean result = FALSE;
-	gboolean have_iter = FALSE;
-	GtkListStore* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (device != NULL, FALSE);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	have_iter = FALSE;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->device_model;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_iter = _tmp1_;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1026 "ui.c"
-		{
-			gboolean _tmp3_ = FALSE;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp3_ = TRUE;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			while (TRUE) {
-#line 1033 "ui.c"
-				gchar* d = NULL;
-				GtkListStore* _tmp8_ = NULL;
-				GtkTreeIter _tmp9_ = {0};
-				const gchar* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_tmp3_) {
-#line 1041 "ui.c"
-					gboolean _tmp4_ = FALSE;
-					gboolean _tmp5_ = FALSE;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp5_ = have_iter;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (!_tmp5_) {
-#line 1048 "ui.c"
-						GtkListStore* _tmp6_ = NULL;
-						gboolean _tmp7_ = FALSE;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp6_ = self->priv->device_model;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp7_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp6_, &_vala_iter);
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp4_ = _tmp7_;
-#line 1057 "ui.c"
-					} else {
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp4_ = FALSE;
-#line 1061 "ui.c"
-					}
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (!_tmp4_) {
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						break;
-#line 1067 "ui.c"
-					}
-				}
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp3_ = FALSE;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp8_ = self->priv->device_model;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp9_ = _vala_iter;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp8_, &_tmp9_, 0, &d, -1, -1);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp10_ = d;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp11_ = device;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					have_iter = TRUE;
-#line 1086 "ui.c"
-				}
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (d);
-#line 1090 "ui.c"
-			}
-		}
-	}
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = have_iter;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (iter) {
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*iter = _vala_iter;
-#line 1100 "ui.c"
-	}
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 1104 "ui.c"
-}
-
-
-static void user_interface_show_error_dialog (UserInterface* self, const gchar* error_title, const gchar* error_text) {
-	GtkMessageDialog* dialog = NULL;
-	const gchar* _tmp0_ = NULL;
-	GtkMessageDialog* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (error_title != NULL);
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (error_text != NULL);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = error_title;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp0_);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp1_);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dialog = _tmp1_;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _ ("_Close");
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) dialog, _tmp2_, 0);
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = error_text;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp3_);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_run ((GtkDialog*) dialog);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) dialog);
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (dialog);
-#line 1142 "ui.c"
-}
-
-
-void user_interface_authorize (UserInterface* self, const gchar* resource, gchar** username, gchar** password) {
-	gchar* _vala_username = NULL;
-	gchar* _vala_password = NULL;
-	gchar* description = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GtkEntry* _tmp3_ = NULL;
-	GtkEntry* _tmp4_ = NULL;
-	GtkLabel* _tmp5_ = NULL;
-	GtkDialog* _tmp6_ = NULL;
-	GtkDialog* _tmp7_ = NULL;
-	GtkDialog* _tmp8_ = NULL;
-	GtkEntry* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	GtkEntry* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (resource != NULL);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = _ ("Username and password required to access '%s'");
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = resource;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	description = _tmp2_;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->username_entry;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_entry_set_text (_tmp3_, "");
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->password_entry;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_entry_set_text (_tmp4_, "");
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = self->priv->authorize_label;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_text (_tmp5_, description);
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = self->priv->authorize_dialog;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = self->priv->authorize_dialog;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_run (_tmp7_);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = self->priv->authorize_dialog;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp8_, FALSE);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = self->priv->username_entry;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = _tmp10_;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = g_strdup (_tmp11_);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_vala_username);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_username = _tmp12_;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = self->priv->password_entry;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = gtk_entry_get_text (_tmp13_);
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = _tmp14_;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = g_strdup (_tmp15_);
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_vala_password);
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_password = _tmp16_;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (description);
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (username) {
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*username = _vala_username;
-#line 1233 "ui.c"
-	} else {
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_vala_username);
-#line 1237 "ui.c"
-	}
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (password) {
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*password = _vala_password;
-#line 1243 "ui.c"
-	} else {
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_vala_password);
-#line 1247 "ui.c"
-	}
-}
-
-
-static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidget* widget) {
-	gboolean _tmp0_ = FALSE;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->setting_devices;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 1268 "ui.c"
-	}
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->user_selected_device = TRUE;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_selected_device (self);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _tmp3_ != NULL;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp3_);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_) {
-#line 1284 "ui.c"
-		GSettings* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = self->priv->settings;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = user_interface_get_selected_device (self);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = _tmp6_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = _tmp7_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_settings_set_string (_tmp5_, "selected-device", _tmp8_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp8_);
-#line 1301 "ui.c"
-	}
-}
-
-
-static void _user_interface_device_combo_changed_cb_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_device_combo_changed_cb ((UserInterface*) self, _sender);
-#line 1309 "ui.c"
-}
-
-
-static void user_interface_update_info_bar (UserInterface* self) {
-	GtkMessageType type = 0;
-	gchar* title = NULL;
-	gchar* text = NULL;
-	gchar* image_id = NULL;
-	gboolean show_close_button = FALSE;
-	gboolean show_install_button = FALSE;
-	gboolean show_change_scanner_button = FALSE;
-	gboolean _tmp0_ = FALSE;
-	GtkInfoBar* _tmp20_ = NULL;
-	GtkMessageType _tmp21_ = 0;
-	GtkImage* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	gchar* message = NULL;
-	const gchar* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	GtkLabel* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
-	GtkButton* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-	GtkButton* _tmp31_ = NULL;
-	gboolean _tmp32_ = FALSE;
-	GtkButton* _tmp33_ = NULL;
-	gboolean _tmp34_ = FALSE;
-	GtkInfoBar* _tmp35_ = NULL;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	show_close_button = FALSE;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	show_install_button = FALSE;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	show_change_scanner_button = FALSE;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->have_error;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 1351 "ui.c"
-		gchar* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		type = GTK_MESSAGE_ERROR;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = g_strdup ("dialog-error");
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (image_id);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		image_id = _tmp1_;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = self->priv->error_title;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = g_strdup (_tmp2_);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (title);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		title = _tmp3_;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->error_text;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = g_strdup (_tmp4_);
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (text);
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		text = _tmp5_;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		show_close_button = TRUE;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = self->priv->error_change_scanner_hint;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		show_change_scanner_button = _tmp6_;
-#line 1388 "ui.c"
-	} else {
-		GtkListStore* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = self->priv->device_model;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL);
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp8_ == 0) {
-#line 1398 "ui.c"
-			gchar* _tmp9_ = NULL;
-			const gchar* _tmp10_ = NULL;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			type = GTK_MESSAGE_WARNING;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp9_ = g_strdup ("dialog-warning");
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (image_id);
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			image_id = _tmp9_;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp10_ = self->priv->missing_driver;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp10_ == NULL) {
-#line 1413 "ui.c"
-				const gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				const gchar* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp11_ = _ ("No scanners detected");
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp12_ = g_strdup (_tmp11_);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (title);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				title = _tmp12_;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp13_ = _ ("Please check your scanner is connected and powered on");
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp14_ = g_strdup (_tmp13_);
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (text);
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				text = _tmp14_;
-#line 1434 "ui.c"
-			} else {
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp15_ = _ ("Additional software needed");
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp16_ = g_strdup (_tmp15_);
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (title);
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				title = _tmp16_;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp17_ = _ ("You need to install driver software for your scanner.");
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp18_ = g_strdup (_tmp17_);
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (text);
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				text = _tmp18_;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				show_install_button = TRUE;
-#line 1458 "ui.c"
-			}
-		} else {
-			GtkInfoBar* _tmp19_ = NULL;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp19_ = self->priv->info_bar;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_widget_set_visible ((GtkWidget*) _tmp19_, FALSE);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (image_id);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (text);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (title);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			return;
-#line 1474 "ui.c"
-		}
-	}
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = self->priv->info_bar;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = type;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_info_bar_set_message_type (_tmp20_, _tmp21_);
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = self->priv->info_bar_image;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = image_id;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_image_set_from_icon_name (_tmp22_, _tmp23_, GTK_ICON_SIZE_DIALOG);
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = title;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = text;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", _tmp24_, _tmp25_);
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	message = _tmp26_;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = self->priv->info_bar_label;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = message;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_markup (_tmp27_, _tmp28_);
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = self->priv->info_bar_close_button;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = show_close_button;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp29_, _tmp30_);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = self->priv->info_bar_change_scanner_button;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = show_change_scanner_button;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp31_, _tmp32_);
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = self->priv->info_bar_install_button;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = show_install_button;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp33_, _tmp34_);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = self->priv->info_bar;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp35_, TRUE);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (message);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (image_id);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (text);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (title);
-#line 1533 "ui.c"
-}
-
-
-static gpointer _scan_device_ref0 (gpointer self) {
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self ? scan_device_ref (self) : NULL;
-#line 1540 "ui.c"
-}
-
-
-void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gchar* missing_driver) {
-	gboolean have_selection = FALSE;
-	gint index = 0;
-	GtkTreeIter iter = {0};
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GList* _tmp6_ = NULL;
-	gboolean _tmp53_ = FALSE;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	have_selection = FALSE;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->setting_devices = TRUE;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = missing_driver;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->missing_driver);
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->missing_driver = _tmp1_;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->user_selected_device;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1571 "ui.c"
-		GtkComboBox* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->device_combo;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = gtk_combo_box_get_active (_tmp3_);
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _tmp4_;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		have_selection = _tmp5_ >= 0;
-#line 1583 "ui.c"
-	}
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = 0;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = devices;
-#line 1589 "ui.c"
-	{
-		GList* device_collection = NULL;
-		GList* device_it = NULL;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		device_collection = _tmp6_;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1597 "ui.c"
-			ScanDevice* _tmp7_ = NULL;
-			ScanDevice* device = NULL;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp7_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			device = _tmp7_;
-#line 1604 "ui.c"
-			{
-				gint n_delete = 0;
-				GtkListStore* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				GtkTreeIter _tmp10_ = {0};
-				gboolean _tmp11_ = FALSE;
-				gint _tmp23_ = 0;
-				gint _tmp46_ = 0;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				n_delete = -1;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp8_ = self->priv->device_model;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp9_ = index;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp11_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp8_, &_tmp10_, NULL, _tmp9_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				iter = _tmp10_;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp11_) {
-#line 1625 "ui.c"
-					gint i = 0;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					i = 0;
-#line 1629 "ui.c"
-					{
-						gboolean _tmp12_ = FALSE;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp12_ = TRUE;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						while (TRUE) {
-#line 1636 "ui.c"
-							gchar* name = NULL;
-							gboolean matched = FALSE;
-							GtkListStore* _tmp15_ = NULL;
-							GtkTreeIter _tmp16_ = {0};
-							const gchar* _tmp17_ = NULL;
-							ScanDevice* _tmp18_ = NULL;
-							const gchar* _tmp19_ = NULL;
-							gboolean _tmp20_ = FALSE;
-							gint _tmp22_ = 0;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (!_tmp12_) {
-#line 1648 "ui.c"
-								GtkListStore* _tmp13_ = NULL;
-								gboolean _tmp14_ = FALSE;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp13_ = self->priv->device_model;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp14_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp13_, &iter);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								if (!_tmp14_) {
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									break;
-#line 1659 "ui.c"
-								}
-							}
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp12_ = FALSE;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp15_ = self->priv->device_model;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp16_ = iter;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							gtk_tree_model_get ((GtkTreeModel*) _tmp15_, &_tmp16_, 0, &name, -1, -1);
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp17_ = name;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp18_ = device;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp19_ = _tmp18_->name;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							matched = g_strcmp0 (_tmp17_, _tmp19_) == 0;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp20_ = matched;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (_tmp20_) {
-#line 1682 "ui.c"
-								gint _tmp21_ = 0;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp21_ = i;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								n_delete = _tmp21_;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_g_free0 (name);
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								break;
-#line 1692 "ui.c"
-							}
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp22_ = i;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							i = _tmp22_ + 1;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_g_free0 (name);
-#line 1700 "ui.c"
-						}
-					}
-				}
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp23_ = n_delete;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp23_ >= 0) {
-#line 1708 "ui.c"
-					gint i = 0;
-					GtkListStore* _tmp24_ = NULL;
-					GtkTreeIter _tmp25_ = {0};
-					ScanDevice* _tmp26_ = NULL;
-					const gchar* _tmp27_ = NULL;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp24_ = self->priv->device_model;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp25_ = iter;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp26_ = device;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp27_ = _tmp26_->label;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_list_store_set (_tmp24_, &_tmp25_, 1, _tmp27_, -1, -1);
-#line 1724 "ui.c"
-					{
-						gboolean _tmp28_ = FALSE;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						i = 0;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp28_ = TRUE;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						while (TRUE) {
-#line 1733 "ui.c"
-							gint _tmp30_ = 0;
-							gint _tmp31_ = 0;
-							GtkListStore* _tmp32_ = NULL;
-							gint _tmp33_ = 0;
-							GtkTreeIter _tmp34_ = {0};
-							GtkListStore* _tmp35_ = NULL;
-							GtkTreeIter _tmp36_ = {0};
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (!_tmp28_) {
-#line 1743 "ui.c"
-								gint _tmp29_ = 0;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp29_ = i;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								i = _tmp29_ + 1;
-#line 1749 "ui.c"
-							}
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp28_ = FALSE;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp30_ = i;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp31_ = n_delete;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (!(_tmp30_ < _tmp31_)) {
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								break;
-#line 1761 "ui.c"
-							}
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp32_ = self->priv->device_model;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp33_ = index;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp32_, &_tmp34_, NULL, _tmp33_);
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							iter = _tmp34_;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp35_ = self->priv->device_model;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp36_ = iter;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							gtk_list_store_remove (_tmp35_, &_tmp36_);
-#line 1777 "ui.c"
-						}
-					}
-				} else {
-					GtkListStore* _tmp37_ = NULL;
-					gint _tmp38_ = 0;
-					GtkTreeIter _tmp39_ = {0};
-					GtkListStore* _tmp40_ = NULL;
-					GtkTreeIter _tmp41_ = {0};
-					ScanDevice* _tmp42_ = NULL;
-					const gchar* _tmp43_ = NULL;
-					ScanDevice* _tmp44_ = NULL;
-					const gchar* _tmp45_ = NULL;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp37_ = self->priv->device_model;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp38_ = index;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_list_store_insert (_tmp37_, &_tmp39_, _tmp38_);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					iter = _tmp39_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp40_ = self->priv->device_model;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp41_ = iter;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp42_ = device;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp43_ = _tmp42_->name;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp44_ = device;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp45_ = _tmp44_->label;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_list_store_set (_tmp40_, &_tmp41_, 0, _tmp43_, 1, _tmp45_, -1, -1);
-#line 1812 "ui.c"
-				}
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp46_ = index;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				index = _tmp46_ + 1;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_scan_device_unref0 (device);
-#line 1820 "ui.c"
-			}
-		}
-	}
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	while (TRUE) {
-#line 1826 "ui.c"
-		GtkListStore* _tmp47_ = NULL;
-		gint _tmp48_ = 0;
-		GtkTreeIter _tmp49_ = {0};
-		gboolean _tmp50_ = FALSE;
-		GtkListStore* _tmp51_ = NULL;
-		GtkTreeIter _tmp52_ = {0};
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp47_ = self->priv->device_model;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp48_ = index;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp50_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp47_, &_tmp49_, NULL, _tmp48_);
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp49_;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (!_tmp50_) {
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			break;
-#line 1845 "ui.c"
-		}
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp51_ = self->priv->device_model;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp52_ = iter;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_list_store_remove (_tmp51_, &_tmp52_);
-#line 1853 "ui.c"
-	}
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp53_ = have_selection;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp53_) {
-#line 1859 "ui.c"
-		gchar* device = NULL;
-		GSettings* _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-		gboolean _tmp56_ = FALSE;
-		const gchar* _tmp57_ = NULL;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp54_ = self->priv->settings;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp55_ = g_settings_get_string (_tmp54_, "selected-device");
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		device = _tmp55_;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp57_ = device;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp57_ != NULL) {
-#line 1875 "ui.c"
-			const gchar* _tmp58_ = NULL;
-			GtkTreeIter _tmp59_ = {0};
-			gboolean _tmp60_ = FALSE;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp58_ = device;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp60_ = user_interface_find_scan_device (self, _tmp58_, &_tmp59_);
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			iter = _tmp59_;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp56_ = _tmp60_;
-#line 1887 "ui.c"
-		} else {
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp56_ = FALSE;
-#line 1891 "ui.c"
-		}
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp56_) {
-#line 1895 "ui.c"
-			GtkComboBox* _tmp61_ = NULL;
-			GtkTreeIter _tmp62_ = {0};
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp61_ = self->priv->device_combo;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp62_ = iter;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_combo_box_set_active_iter (_tmp61_, &_tmp62_);
-#line 1904 "ui.c"
-		} else {
-			GtkComboBox* _tmp63_ = NULL;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp63_ = self->priv->device_combo;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_combo_box_set_active (_tmp63_, 0);
-#line 1911 "ui.c"
-		}
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (device);
-#line 1915 "ui.c"
-	}
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->setting_devices = FALSE;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_update_info_bar (self);
-#line 1921 "ui.c"
-}
-
-
-static void user_interface_add_default_page (UserInterface* self) {
-	Page* page = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	ScanDirection _tmp3_ = 0;
-	Page* _tmp4_ = NULL;
-	Book* _tmp5_ = NULL;
-	BookView* _tmp6_ = NULL;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->default_page_width;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->default_page_height;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->default_page_dpi;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->default_page_scan_direction;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp4_;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = self->priv->_book;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_append_page (_tmp5_, page);
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = self->priv->book_view;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_view_set_selected_page (_tmp6_, page);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 1958 "ui.c"
-}
-
-
-static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_atomic_int_inc (&_data1_->_ref_count_);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return _data1_;
-#line 1967 "ui.c"
-}
-
-
-static void block1_data_unref (void * _userdata_) {
-	Block1Data* _data1_;
-	_data1_ = (Block1Data*) _userdata_;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 1976 "ui.c"
-		UserInterface* self;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self = _data1_->self;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data1_->file_type_combo);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data1_->file_type_store);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (self);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_slice_free (Block1Data, _data1_);
-#line 1988 "ui.c"
-	}
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 1996 "ui.c"
-}
-
-
-static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 2021 "ui.c"
-		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 2029 "ui.c"
-	} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 2035 "ui.c"
-	}
-}
-
-
-static gchar* string_slice (const gchar* self, glong start, glong end) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
-	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
-	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp2_ < ((glong) 0)) {
-#line 2069 "ui.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		start = _tmp3_ + _tmp4_;
-#line 2078 "ui.c"
-	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp5_ < ((glong) 0)) {
-#line 2084 "ui.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		end = _tmp6_ + _tmp7_;
-#line 2093 "ui.c"
-	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp9_ >= ((glong) 0)) {
-#line 2099 "ui.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 2108 "ui.c"
-	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = FALSE;
-#line 2112 "ui.c"
-	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp13_ >= ((glong) 0)) {
-#line 2120 "ui.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 2129 "ui.c"
-	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = FALSE;
-#line 2133 "ui.c"
-	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 2155 "ui.c"
-}
-
-
-static void __lambda5_ (Block1Data* _data1_) {
-	UserInterface* self;
-	gchar* extension = NULL;
-	gchar* _tmp0_ = NULL;
-	GtkTreeIter i = {0};
-	GtkComboBox* _tmp1_ = NULL;
-	GtkTreeIter _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
-	gchar* path = NULL;
-	GtkFileChooserDialog* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* filename = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gint extension_index = 0;
-	const gchar* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	const gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	GtkFileChooserDialog* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data1_->self;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = g_strdup ("");
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	extension = _tmp0_;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _data1_->file_type_combo;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	i = _tmp2_;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_) {
-#line 2196 "ui.c"
-		GtkListStore* _tmp4_ = NULL;
-		GtkTreeIter _tmp5_ = {0};
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = _data1_->file_type_store;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = i;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 1, &extension, -1, -1);
-#line 2205 "ui.c"
-	}
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = self->priv->save_dialog;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp6_);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	path = _tmp7_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = path;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = g_path_get_basename (_tmp8_);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filename = _tmp9_;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = filename;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = string_last_index_of_char (_tmp10_, (gunichar) '.', 0);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	extension_index = _tmp11_;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = extension_index;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp12_ >= 0) {
-#line 2229 "ui.c"
-		const gchar* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		gchar* _tmp15_ = NULL;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = filename;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = extension_index;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = string_slice (_tmp13_, (glong) 0, (glong) _tmp14_);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (filename);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		filename = _tmp15_;
-#line 2243 "ui.c"
-	}
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = filename;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = extension;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = g_strconcat (_tmp16_, _tmp17_, NULL);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (filename);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filename = _tmp18_;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = self->priv->save_dialog;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = filename;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp19_, _tmp20_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (filename);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (path);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (extension);
-#line 2267 "ui.c"
-}
-
-
-static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda5_ (self);
-#line 2274 "ui.c"
-}
-
-
-static gchar* user_interface_choose_file_location (UserInterface* self) {
-	gchar* result = NULL;
-	Block1Data* _data1_;
-	gchar* directory = NULL;
-	GSettings* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	GtkFileChooserDialog* _tmp10_ = NULL;
-	GtkFileChooserDialog* _tmp11_ = NULL;
-	GtkFileChooserDialog* _tmp12_ = NULL;
-	GtkFileChooserDialog* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkFileChooserDialog* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	GtkFileFilter* filter = NULL;
-	GtkFileFilter* _tmp17_ = NULL;
-	GtkFileFilter* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	GtkFileFilter* _tmp20_ = NULL;
-	GtkFileFilter* _tmp21_ = NULL;
-	GtkFileChooserDialog* _tmp22_ = NULL;
-	GtkFileFilter* _tmp23_ = NULL;
-	GtkFileFilter* _tmp24_ = NULL;
-	GtkFileFilter* _tmp25_ = NULL;
-	GtkFileFilter* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	GtkFileFilter* _tmp28_ = NULL;
-	GtkFileChooserDialog* _tmp29_ = NULL;
-	GtkFileFilter* _tmp30_ = NULL;
-	GtkFileFilter* _tmp31_ = NULL;
-	GtkListStore* _tmp32_ = NULL;
-	GtkTreeIter iter = {0};
-	GtkListStore* _tmp33_ = NULL;
-	GtkTreeIter _tmp34_ = {0};
-	GtkListStore* _tmp35_ = NULL;
-	GtkTreeIter _tmp36_ = {0};
-	const gchar* _tmp37_ = NULL;
-	GtkListStore* _tmp38_ = NULL;
-	GtkTreeIter _tmp39_ = {0};
-	GtkListStore* _tmp40_ = NULL;
-	GtkTreeIter _tmp41_ = {0};
-	const gchar* _tmp42_ = NULL;
-	GtkListStore* _tmp43_ = NULL;
-	GtkTreeIter _tmp44_ = {0};
-	GtkListStore* _tmp45_ = NULL;
-	GtkTreeIter _tmp46_ = {0};
-	const gchar* _tmp47_ = NULL;
-	GtkBox* box = NULL;
-	GtkBox* _tmp48_ = NULL;
-	GtkBox* _tmp49_ = NULL;
-	GtkFileChooserDialog* _tmp50_ = NULL;
-	GtkBox* _tmp51_ = NULL;
-	GtkLabel* label = NULL;
-	const gchar* _tmp52_ = NULL;
-	GtkLabel* _tmp53_ = NULL;
-	GtkLabel* _tmp54_ = NULL;
-	GtkBox* _tmp55_ = NULL;
-	GtkLabel* _tmp56_ = NULL;
-	GtkListStore* _tmp57_ = NULL;
-	GtkComboBox* _tmp58_ = NULL;
-	GtkComboBox* _tmp59_ = NULL;
-	GtkCellRendererText* renderer = NULL;
-	GtkCellRendererText* _tmp60_ = NULL;
-	GtkComboBox* _tmp61_ = NULL;
-	GtkCellRendererText* _tmp62_ = NULL;
-	GtkComboBox* _tmp63_ = NULL;
-	GtkCellRendererText* _tmp64_ = NULL;
-	GtkComboBox* _tmp65_ = NULL;
-	GtkComboBox* _tmp66_ = NULL;
-	GtkBox* _tmp67_ = NULL;
-	GtkComboBox* _tmp68_ = NULL;
-	gint response = 0;
-	GtkFileChooserDialog* _tmp69_ = NULL;
-	gint _tmp70_ = 0;
-	gchar* uri = NULL;
-	gint _tmp71_ = 0;
-	GSettings* _tmp92_ = NULL;
-	GtkFileChooserDialog* _tmp93_ = NULL;
-	gchar* _tmp94_ = NULL;
-	gchar* _tmp95_ = NULL;
-	GtkFileChooserDialog* _tmp96_ = NULL;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_ = g_slice_new0 (Block1Data);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_->_ref_count_ = 1;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_->self = g_object_ref (self);
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	directory = NULL;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->settings;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_settings_get_string (_tmp0_, "save-directory");
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (directory);
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	directory = _tmp1_;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = directory;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_ == NULL) {
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = TRUE;
-#line 2387 "ui.c"
-	} else {
-		const gchar* _tmp4_ = NULL;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = directory;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2394 "ui.c"
-	}
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 2398 "ui.c"
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = g_strdup (_tmp5_);
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (directory);
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		directory = _tmp6_;
-#line 2409 "ui.c"
-	}
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = _ ("Save As...");
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = _ ("_Cancel");
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = _ ("_Save");
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp7_, (GtkWindow*) self, GTK_FILE_CHOOSER_ACTION_SAVE, _tmp8_, GTK_RESPONSE_CANCEL, _tmp9_, GTK_RESPONSE_ACCEPT, NULL, NULL);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp10_);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_dialog);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_dialog = _tmp10_;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = self->priv->save_dialog;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp11_, TRUE);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = self->priv->save_dialog;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp12_, FALSE);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = self->priv->save_dialog;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = directory;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp13_, _tmp14_);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = self->priv->save_dialog;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = _ ("Scanned Document.pdf");
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = gtk_file_filter_new ();
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp17_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filter = _tmp17_;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = filter;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = _ ("Image Files");
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_set_name (_tmp18_, _tmp19_);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = filter;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_pixbuf_formats (_tmp20_);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = filter;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_mime_type (_tmp21_, "application/pdf");
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = self->priv->save_dialog;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = filter;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp22_, _tmp24_);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = gtk_file_filter_new ();
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp25_);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (filter);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filter = _tmp25_;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = filter;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = _ ("All Files");
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_set_name (_tmp26_, _tmp27_);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = filter;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_pattern (_tmp28_, "*");
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = self->priv->save_dialog;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = filter;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp29_, _tmp31_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_->file_type_store = _tmp32_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = _data1_->file_type_store;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp33_, &_tmp34_);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp34_;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = _data1_->file_type_store;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp36_ = iter;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp37_ = _ ("PDF (multi-page document)");
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp35_, &_tmp36_, 0, _tmp37_, 1, ".pdf", -1, -1);
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp38_ = _data1_->file_type_store;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp38_, &_tmp39_);
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp39_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = _data1_->file_type_store;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp41_ = iter;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp42_ = _ ("JPEG (compressed)");
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp40_, &_tmp41_, 0, _tmp42_, 1, ".jpg", -1, -1);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp43_ = _data1_->file_type_store;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp43_, &_tmp44_);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp44_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp45_ = _data1_->file_type_store;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp46_ = iter;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp47_ = _ ("PNG (lossless)");
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp45_, &_tmp46_, 0, _tmp47_, 1, ".png", -1, -1);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp48_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp48_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	box = _tmp48_;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp49_ = box;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp50_ = self->priv->save_dialog;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp51_ = box;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp50_, (GtkWidget*) _tmp51_);
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp52_ = _ ("File format:");
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp53_ = (GtkLabel*) gtk_label_new (_tmp52_);
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp53_);
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	label = _tmp53_;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp54_ = label;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp54_, TRUE);
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = box;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp56_ = label;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp55_, (GtkWidget*) _tmp56_, FALSE, FALSE, (guint) 0);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp57_ = _data1_->file_type_store;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp58_ = (GtkComboBox*) gtk_combo_box_new_with_model ((GtkTreeModel*) _tmp57_);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp58_);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_->file_type_combo = _tmp58_;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = _data1_->file_type_combo;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp59_, TRUE);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp60_);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp60_;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = _data1_->file_type_combo;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp62_ = renderer;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp61_, (GtkCellRenderer*) _tmp62_, TRUE);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = _data1_->file_type_combo;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = renderer;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp63_, (GtkCellRenderer*) _tmp64_, "text", 0);
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = _data1_->file_type_combo;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_combo_box_set_active (_tmp65_, 0);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = _data1_->file_type_combo;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp66_, "changed", (GCallback) ___lambda5__gtk_combo_box_changed, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp67_ = box;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = _data1_->file_type_combo;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, FALSE, FALSE, (guint) 0);
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = self->priv->save_dialog;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp70_ = gtk_dialog_run ((GtkDialog*) _tmp69_);
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	response = _tmp70_;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	uri = NULL;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp71_ = response;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp71_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2635 "ui.c"
-		gchar* extension = NULL;
-		gchar* _tmp72_ = NULL;
-		GtkTreeIter i = {0};
-		GtkComboBox* _tmp73_ = NULL;
-		GtkTreeIter _tmp74_ = {0};
-		gboolean _tmp75_ = FALSE;
-		gchar* path = NULL;
-		GtkFileChooserDialog* _tmp78_ = NULL;
-		gchar* _tmp79_ = NULL;
-		gchar* filename = NULL;
-		const gchar* _tmp80_ = NULL;
-		gchar* _tmp81_ = NULL;
-		gint extension_index = 0;
-		const gchar* _tmp82_ = NULL;
-		gint _tmp83_ = 0;
-		gint _tmp84_ = 0;
-		const gchar* _tmp88_ = NULL;
-		GFile* _tmp89_ = NULL;
-		GFile* _tmp90_ = NULL;
-		gchar* _tmp91_ = NULL;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp72_ = g_strdup ("");
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		extension = _tmp72_;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp73_ = _data1_->file_type_combo;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp75_ = gtk_combo_box_get_active_iter (_tmp73_, &_tmp74_);
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		i = _tmp74_;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp75_) {
-#line 2668 "ui.c"
-			GtkListStore* _tmp76_ = NULL;
-			GtkTreeIter _tmp77_ = {0};
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp76_ = _data1_->file_type_store;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp77_ = i;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_tree_model_get ((GtkTreeModel*) _tmp76_, &_tmp77_, 1, &extension, -1, -1);
-#line 2677 "ui.c"
-		}
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp78_ = self->priv->save_dialog;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp79_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp78_);
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		path = _tmp79_;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp80_ = path;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp81_ = g_path_get_basename (_tmp80_);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		filename = _tmp81_;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp82_ = filename;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp83_ = string_last_index_of_char (_tmp82_, (gunichar) '.', 0);
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		extension_index = _tmp83_;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp84_ = extension_index;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp84_ < 0) {
-#line 2701 "ui.c"
-			const gchar* _tmp85_ = NULL;
-			const gchar* _tmp86_ = NULL;
-			gchar* _tmp87_ = NULL;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp85_ = path;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp86_ = extension;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp87_ = g_strconcat (_tmp85_, _tmp86_, NULL);
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (path);
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			path = _tmp87_;
-#line 2715 "ui.c"
-		}
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp88_ = path;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp89_ = g_file_new_for_path (_tmp88_);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp90_ = _tmp89_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp91_ = g_file_get_uri (_tmp90_);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (uri);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		uri = _tmp91_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_tmp90_);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (filename);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (path);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (extension);
-#line 2737 "ui.c"
-	}
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp92_ = self->priv->settings;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp93_ = self->priv->save_dialog;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp94_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp93_);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp95_ = _tmp94_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_string (_tmp92_, "save-directory", _tmp95_);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp95_);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp96_ = self->priv->save_dialog;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp96_);
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_dialog);
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_dialog = NULL;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = uri;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (renderer);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (label);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (box);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (filter);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (directory);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	block1_data_unref (_data1_);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_ = NULL;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 2777 "ui.c"
-}
-
-
-static gboolean user_interface_save_document (UserInterface* self, gboolean force_choose_location) {
-	gboolean result = FALSE;
-	gchar* uri = NULL;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GFile* file = NULL;
-	const gchar* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* uri_lower = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* format = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	const gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
-	Book* _tmp41_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->book_uri;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_ != NULL) {
-#line 2808 "ui.c"
-		gboolean _tmp2_ = FALSE;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = force_choose_location;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = !_tmp2_;
-#line 2814 "ui.c"
-	} else {
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = FALSE;
-#line 2818 "ui.c"
-	}
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 2822 "ui.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->book_uri;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = g_strdup (_tmp3_);
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (uri);
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		uri = _tmp4_;
-#line 2833 "ui.c"
-	} else {
-		gchar* _tmp5_ = NULL;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = user_interface_choose_file_location (self);
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (uri);
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		uri = _tmp5_;
-#line 2842 "ui.c"
-	}
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = uri;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp6_ == NULL) {
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = FALSE;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (uri);
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 2854 "ui.c"
-	}
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = uri;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	file = _tmp8_;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = uri;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:627: Saving to '%s'", _tmp9_);
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = uri;
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = g_utf8_strdown (_tmp10_, (gssize) -1);
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	uri_lower = _tmp11_;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = g_strdup ("jpeg");
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	format = _tmp12_;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = uri_lower;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = g_str_has_suffix (_tmp13_, ".pdf");
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp14_) {
-#line 2882 "ui.c"
-		gchar* _tmp15_ = NULL;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = g_strdup ("pdf");
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (format);
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		format = _tmp15_;
-#line 2890 "ui.c"
-	} else {
-		const gchar* _tmp16_ = NULL;
-		gboolean _tmp17_ = FALSE;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = uri_lower;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = g_str_has_suffix (_tmp16_, ".ps");
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp17_) {
-#line 2900 "ui.c"
-			gchar* _tmp18_ = NULL;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp18_ = g_strdup ("ps");
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (format);
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			format = _tmp18_;
-#line 2908 "ui.c"
-		} else {
-			const gchar* _tmp19_ = NULL;
-			gboolean _tmp20_ = FALSE;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp19_ = uri_lower;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp20_ = g_str_has_suffix (_tmp19_, ".png");
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp20_) {
-#line 2918 "ui.c"
-				gchar* _tmp21_ = NULL;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp21_ = g_strdup ("png");
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (format);
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				format = _tmp21_;
-#line 2926 "ui.c"
-			} else {
-				gboolean _tmp22_ = FALSE;
-				const gchar* _tmp23_ = NULL;
-				gboolean _tmp24_ = FALSE;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp23_ = uri_lower;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp24_ = g_str_has_suffix (_tmp23_, ".tif");
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp24_) {
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp22_ = TRUE;
-#line 2939 "ui.c"
-				} else {
-					const gchar* _tmp25_ = NULL;
-					gboolean _tmp26_ = FALSE;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp25_ = uri_lower;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp26_ = g_str_has_suffix (_tmp25_, ".tiff");
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp22_ = _tmp26_;
-#line 2949 "ui.c"
-				}
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp22_) {
-#line 2953 "ui.c"
-					gchar* _tmp27_ = NULL;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp27_ = g_strdup ("tiff");
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_g_free0 (format);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					format = _tmp27_;
-#line 2961 "ui.c"
-				}
-			}
-		}
-	}
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_show_progress_dialog (self);
-#line 2968 "ui.c"
-	{
-		Book* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gint _tmp30_ = 0;
-		gint _tmp31_ = 0;
-		GFile* _tmp32_ = NULL;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp28_ = self->priv->_book;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp29_ = format;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp30_ = user_interface_get_quality (self);
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp31_ = _tmp30_;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp32_ = file;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_save (_tmp28_, _tmp29_, _tmp31_, _tmp32_, &_inner_error_);
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2989 "ui.c"
-			goto __catch17_g_error;
-		}
-	}
-	goto __finally17;
-	__catch17_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
-		GError* _tmp36_ = NULL;
-		const gchar* _tmp37_ = NULL;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_hide_progress_dialog (self);
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp33_ = e;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp34_ = _tmp33_->message;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:648: Error saving file: %s", _tmp34_);
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp35_ = _ ("Failed to save file");
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp36_ = e;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp37_ = _tmp36_->message;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error (self, _tmp35_, _tmp37_, FALSE);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = FALSE;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (format);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (uri_lower);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (file);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (uri);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 3036 "ui.c"
-	}
-	__finally17:
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3041 "ui.c"
-		gboolean _tmp38_ = FALSE;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (format);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (uri_lower);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (file);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (uri);
-#line 641 "/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 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return _tmp38_;
-#line 3057 "ui.c"
-	}
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp39_ = uri;
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = g_strdup (_tmp39_);
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->book_uri);
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_uri = _tmp40_;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp41_ = self->priv->_book;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_set_needs_saving (_tmp41_, FALSE);
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = TRUE;
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (format);
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (uri_lower);
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (file);
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (uri);
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 3083 "ui.c"
-}
-
-
-static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* title, const gchar* discard_label) {
-	gboolean result = FALSE;
-	Book* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	GtkMessageDialog* dialog = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkMessageDialog* _tmp4_ = NULL;
-	GtkMessageDialog* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkMessageDialog* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkMessageDialog* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	GtkMessageDialog* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gint response = 0;
-	GtkMessageDialog* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	GtkMessageDialog* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (title != NULL, FALSE);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (discard_label != NULL, FALSE);
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->_book;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_get_needs_saving (_tmp0_);
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp2_) {
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = TRUE;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 3126 "ui.c"
-	}
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = title;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp3_);
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp4_);
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dialog = _tmp4_;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = dialog;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = _ ("If you don't save, changes will be permanently lost.");
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_message_dialog_format_secondary_text (_tmp5_, "%s", _tmp6_);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = dialog;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = discard_label;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp7_, _tmp8_, (gint) GTK_RESPONSE_NO);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = dialog;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = _ ("_Cancel");
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp9_, _tmp10_, (gint) GTK_RESPONSE_CANCEL);
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = dialog;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = _ ("_Save");
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp11_, _tmp12_, (gint) GTK_RESPONSE_YES);
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = dialog;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = gtk_dialog_run ((GtkDialog*) _tmp13_);
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	response = _tmp14_;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = dialog;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp15_);
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = response;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (_tmp16_) {
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case GTK_RESPONSE_YES:
-#line 3176 "ui.c"
-		{
-			gboolean _tmp17_ = FALSE;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp17_ = user_interface_save_document (self, FALSE);
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp17_) {
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				result = TRUE;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_object_unref0 (dialog);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				return result;
-#line 3189 "ui.c"
-			} else {
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				result = FALSE;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_object_unref0 (dialog);
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				return result;
-#line 3197 "ui.c"
-			}
-		}
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case GTK_RESPONSE_NO:
-#line 3202 "ui.c"
-		{
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			result = TRUE;
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_object_unref0 (dialog);
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			return result;
-#line 3210 "ui.c"
-		}
-		default:
-		{
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			result = FALSE;
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_object_unref0 (dialog);
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			return result;
-#line 3220 "ui.c"
-		}
-	}
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (dialog);
-#line 3225 "ui.c"
-}
-
-
-static void user_interface_clear_document (UserInterface* self) {
-	Book* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-	GtkMenuItem* _tmp2_ = NULL;
-	GtkMenuItem* _tmp3_ = NULL;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->_book;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_clear (_tmp0_);
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_add_default_page (self);
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->book_uri);
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_uri = NULL;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->_book;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_set_needs_saving (_tmp1_, FALSE);
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->save_as_menuitem;
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 3258 "ui.c"
-}
-
-
-static void user_interface_new_document (UserInterface* self) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = _ ("Save current document?");
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _ ("Discard Changes");
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp2_) {
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 3280 "ui.c"
-	}
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = user_interface_get_scanning (self);
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _tmp3_;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_) {
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_signal_emit_by_name (self, "stop-scan");
-#line 3290 "ui.c"
-	}
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_clear_document (self);
-#line 3294 "ui.c"
-}
-
-
-static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_new_document (self);
-#line 3305 "ui.c"
-}
-
-
-static void _user_interface_new_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_new_button_clicked_cb ((UserInterface*) self, _sender);
-#line 3312 "ui.c"
-}
-
-
-void user_interface_new_document_activate_cb (UserInterface* self) {
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_new_document (self);
-#line 3321 "ui.c"
-}
-
-
-static void user_interface_set_document_hint (UserInterface* self, const gchar* document_hint, gboolean save) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp10_ = FALSE;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (document_hint != NULL);
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = document_hint;
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->document_hint);
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->document_hint = _tmp1_;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = document_hint;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_strcmp0 (_tmp2_, "text") == 0) {
-#line 3346 "ui.c"
-		GtkRadioMenuItem* _tmp3_ = NULL;
-		GtkRadioMenuItem* _tmp4_ = NULL;
-		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->text_button_menuitem;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->text_button_hb_menuitem;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = self->priv->text_menuitem;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 3362 "ui.c"
-	} else {
-		const gchar* _tmp6_ = NULL;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = document_hint;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (g_strcmp0 (_tmp6_, "photo") == 0) {
-#line 3369 "ui.c"
-			GtkRadioMenuItem* _tmp7_ = NULL;
-			GtkRadioMenuItem* _tmp8_ = NULL;
-			GtkRadioMenuItem* _tmp9_ = NULL;
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp7_ = self->priv->photo_button_menuitem;
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp8_ = self->priv->photo_button_hb_menuitem;
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp8_, TRUE);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp9_ = self->priv->photo_menuitem;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
-#line 3385 "ui.c"
-		}
-	}
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = save;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp10_) {
-#line 3392 "ui.c"
-		GSettings* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = self->priv->settings;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = document_hint;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_settings_set_string (_tmp11_, "document-type", _tmp12_);
-#line 3401 "ui.c"
-	}
-}
-
-
-static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#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"
-	_tmp0_ = widget;
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, "text", TRUE);
-#line 3424 "ui.c"
-	}
-}
-
-
-static void _user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_text_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 3432 "ui.c"
-}
-
-
-static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = widget;
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, "photo", TRUE);
-#line 3454 "ui.c"
-	}
-}
-
-
-static void _user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_photo_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 3462 "ui.c"
-}
-
-
-static void user_interface_set_page_side (UserInterface* self, ScanType page_side) {
-	GtkTreeIter iter = {0};
-	GtkListStore* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-#line 764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->page_side_model;
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp1_;
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 3481 "ui.c"
-		{
-			gboolean _tmp3_ = FALSE;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp3_ = TRUE;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			while (TRUE) {
-#line 3488 "ui.c"
-				gint s = 0;
-				GtkListStore* _tmp6_ = NULL;
-				GtkTreeIter _tmp7_ = {0};
-				gint _tmp8_ = 0;
-				ScanType _tmp9_ = 0;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_tmp3_) {
-#line 3496 "ui.c"
-					GtkListStore* _tmp4_ = NULL;
-					gboolean _tmp5_ = FALSE;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp4_ = self->priv->page_side_model;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (!_tmp5_) {
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						break;
-#line 3507 "ui.c"
-					}
-				}
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp3_ = FALSE;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp6_ = self->priv->page_side_model;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp7_ = iter;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, 0, &s, -1, -1);
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp8_ = s;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp9_ = page_side;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp8_ == ((gint) _tmp9_)) {
-#line 3524 "ui.c"
-					GtkComboBox* _tmp10_ = NULL;
-					GtkTreeIter _tmp11_ = {0};
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp10_ = self->priv->page_side_combo;
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp11_ = iter;
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					return;
-#line 3535 "ui.c"
-				}
-			}
-		}
-	}
-}
-
-
-static void user_interface_set_paper_size (UserInterface* self, gint width, gint height) {
-	GtkTreeIter iter = {0};
-	gboolean have_iter = FALSE;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp18_ = FALSE;
-#line 783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 3550 "ui.c"
-	{
-		GtkListStore* _tmp0_ = NULL;
-		GtkTreeIter _tmp1_ = {0};
-		gboolean _tmp2_ = FALSE;
-		gboolean _tmp3_ = FALSE;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = self->priv->paper_size_model;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp1_;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		have_iter = _tmp2_;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = TRUE;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		while (TRUE) {
-#line 3568 "ui.c"
-			gboolean _tmp6_ = FALSE;
-			gint w = 0;
-			gint h = 0;
-			GtkListStore* _tmp7_ = NULL;
-			GtkTreeIter _tmp8_ = {0};
-			gboolean _tmp9_ = FALSE;
-			gint _tmp10_ = 0;
-			gint _tmp11_ = 0;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (!_tmp3_) {
-#line 3579 "ui.c"
-				GtkListStore* _tmp4_ = NULL;
-				gboolean _tmp5_ = FALSE;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp4_ = self->priv->paper_size_model;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				have_iter = _tmp5_;
-#line 3588 "ui.c"
-			}
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp3_ = FALSE;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp6_ = have_iter;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (!_tmp6_) {
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 3598 "ui.c"
-			}
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp7_ = self->priv->paper_size_model;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp8_ = iter;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &w, 1, &h, -1, -1);
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp10_ = w;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp11_ = width;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp10_ == _tmp11_) {
-#line 3612 "ui.c"
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp12_ = h;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp13_ = height;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp9_ = _tmp12_ == _tmp13_;
-#line 3621 "ui.c"
-			} else {
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp9_ = FALSE;
-#line 3625 "ui.c"
-			}
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp9_) {
-#line 795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 3631 "ui.c"
-			}
-		}
-	}
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = have_iter;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp14_) {
-#line 3639 "ui.c"
-		GtkListStore* _tmp15_ = NULL;
-		GtkTreeIter _tmp16_ = {0};
-		gboolean _tmp17_ = FALSE;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = self->priv->paper_size_model;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp15_, &_tmp16_);
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp16_;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		have_iter = _tmp17_;
-#line 3651 "ui.c"
-	}
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = have_iter;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp18_) {
-#line 3657 "ui.c"
-		GtkComboBox* _tmp19_ = NULL;
-		GtkTreeIter _tmp20_ = {0};
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp19_ = self->priv->paper_size_combo;
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp20_ = iter;
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_);
-#line 3666 "ui.c"
-	}
-}
-
-
-static gint user_interface_get_text_dpi (UserInterface* self) {
-	gint result = 0;
-	GtkTreeIter iter = {0};
-	gint dpi = 0;
-	GtkComboBox* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->text_dpi_combo;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp1_;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 3690 "ui.c"
-		GtkListStore* _tmp3_ = NULL;
-		GtkTreeIter _tmp4_ = {0};
-#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->text_dpi_model;
-#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = iter;
-#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3699 "ui.c"
-	}
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = dpi;
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 3705 "ui.c"
-}
-
-
-static gint user_interface_get_photo_dpi (UserInterface* self) {
-	gint result = 0;
-	GtkTreeIter iter = {0};
-	gint dpi = 0;
-	GtkComboBox* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->photo_dpi_combo;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp1_;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 3728 "ui.c"
-		GtkListStore* _tmp3_ = NULL;
-		GtkTreeIter _tmp4_ = {0};
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->photo_dpi_model;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = iter;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3737 "ui.c"
-	}
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = dpi;
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 3743 "ui.c"
-}
-
-
-static ScanType user_interface_get_page_side (UserInterface* self) {
-	ScanType result = 0;
-	GtkTreeIter iter = {0};
-	gint page_side = 0;
-	GtkComboBox* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	gint _tmp5_ = 0;
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page_side = (gint) SCAN_TYPE_ADF_BOTH;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->page_side_combo;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp1_;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 3767 "ui.c"
-		GtkListStore* _tmp3_ = NULL;
-		GtkTreeIter _tmp4_ = {0};
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->page_side_model;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = iter;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
-#line 3776 "ui.c"
-	}
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page_side;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (ScanType) _tmp5_;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 3784 "ui.c"
-}
-
-
-static gboolean user_interface_get_paper_size (UserInterface* self, gint* width, gint* height) {
-	gint _vala_width = 0;
-	gint _vala_height = 0;
-	gboolean result = FALSE;
-	GtkTreeIter iter = {0};
-	gint _tmp0_ = 0;
-	GtkComboBox* _tmp1_ = NULL;
-	GtkTreeIter _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_height = 0;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = _vala_height;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_width = _tmp0_;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->paper_size_combo;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp2_;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_) {
-#line 3813 "ui.c"
-		GtkListStore* _tmp4_ = NULL;
-		GtkTreeIter _tmp5_ = {0};
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->paper_size_model;
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = iter;
-#line 844 "/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 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = TRUE;
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (width) {
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			*width = _vala_width;
-#line 3828 "ui.c"
-		}
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (height) {
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			*height = _vala_height;
-#line 3834 "ui.c"
-		}
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 3838 "ui.c"
-	}
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = FALSE;
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (width) {
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*width = _vala_width;
-#line 3846 "ui.c"
-	}
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (height) {
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*height = _vala_height;
-#line 3852 "ui.c"
-	}
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 3856 "ui.c"
-}
-
-
-static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
-	ScanOptions* result = NULL;
-	ScanOptions* options = NULL;
-	ScanOptions* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	ScanOptions* _tmp10_ = NULL;
-	ScanOptions* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	ScanOptions* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	ScanOptions* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = scan_options_new ();
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	options = _tmp0_;
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->document_hint;
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 3885 "ui.c"
-		ScanOptions* _tmp2_ = NULL;
-		ScanOptions* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		ScanOptions* _tmp5_ = NULL;
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = options;
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_->scan_mode = SCAN_MODE_GRAY;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = options;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = user_interface_get_text_dpi (self);
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_->dpi = _tmp4_;
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = options;
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_->depth = 2;
-#line 3904 "ui.c"
-	} else {
-		ScanOptions* _tmp6_ = NULL;
-		ScanOptions* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		ScanOptions* _tmp9_ = NULL;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = options;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_->scan_mode = SCAN_MODE_COLOR;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = options;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = user_interface_get_photo_dpi (self);
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_->dpi = _tmp8_;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = options;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_->depth = 8;
-#line 3924 "ui.c"
-	}
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = options;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = options;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_get_paper_size (self, &_tmp12_, &_tmp13_);
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_->paper_width = _tmp12_;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_->paper_height = _tmp13_;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = options;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = user_interface_get_brightness (self);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = _tmp15_;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_->brightness = _tmp16_;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = options;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = user_interface_get_contrast (self);
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = _tmp18_;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_->contrast = _tmp19_;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = options;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 3956 "ui.c"
-}
-
-
-static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-	ScanOptions* options = NULL;
-	ScanOptions* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = user_interface_make_scan_options (self);
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	options = _tmp0_;
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	options->type = SCAN_TYPE_SINGLE;
-#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_selected_device (self);
-#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_emit_by_name (self, "start-scan", _tmp3_, options);
-#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp3_);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_scan_options_unref0 (options);
-#line 3988 "ui.c"
-}
-
-
-static void _user_interface_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 3995 "ui.c"
-}
-
-
-static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_emit_by_name (self, "stop-scan");
-#line 4006 "ui.c"
-}
-
-
-static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_stop_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4013 "ui.c"
-}
-
-
-static void user_interface_continuous_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = user_interface_get_scanning (self);
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _tmp0_;
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_signal_emit_by_name (self, "stop-scan");
-#line 4032 "ui.c"
-	} else {
-		ScanOptions* options = NULL;
-		ScanOptions* _tmp2_ = NULL;
-		ScanOptions* _tmp3_ = NULL;
-		ScanType _tmp4_ = 0;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		ScanOptions* _tmp8_ = NULL;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = user_interface_make_scan_options (self);
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		options = _tmp2_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = options;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = user_interface_get_page_side (self);
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_->type = _tmp4_;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = user_interface_get_selected_device (self);
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = _tmp5_;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = _tmp6_;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = options;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_signal_emit_by_name (self, "start-scan", _tmp7_, _tmp8_);
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp7_);
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_scan_options_unref0 (options);
-#line 4066 "ui.c"
-	}
-}
-
-
-static void _user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_continuous_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4074 "ui.c"
-}
-
-
-static void user_interface_preferences_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-	GtkDialog* _tmp0_ = NULL;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->preferences_dialog;
-#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4088 "ui.c"
-}
-
-
-static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_preferences_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4095 "ui.c"
-}
-
-
-void user_interface_preferences_activate_cb (UserInterface* self) {
-	GtkDialog* _tmp0_ = NULL;
-#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->preferences_dialog;
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4107 "ui.c"
-}
-
-
-static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
-	gboolean result = FALSE;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = TRUE;
-#line 914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 4123 "ui.c"
-}
-
-
-static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
-	gboolean result;
-	result = user_interface_preferences_dialog_delete_event_cb ((UserInterface*) self, _sender, event);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 4132 "ui.c"
-}
-
-
-static void user_interface_preferences_dialog_response_cb (UserInterface* self, GtkWidget* widget, gint response_id) {
-	GtkDialog* _tmp0_ = NULL;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->preferences_dialog;
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 4146 "ui.c"
-}
-
-
-static void _user_interface_preferences_dialog_response_cb_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_preferences_dialog_response_cb ((UserInterface*) self, _sender, response_id);
-#line 4153 "ui.c"
-}
-
-
-static gpointer _page_ref0 (gpointer self) {
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self ? page_ref (self) : NULL;
-#line 4160 "ui.c"
-}
-
-
-static void user_interface_update_page_menu (UserInterface* self) {
-	Page* page = NULL;
-	BookView* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book_view;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _page_ref0 (_tmp2_);
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_ == NULL) {
-#line 4187 "ui.c"
-		GtkMenuItem* _tmp5_ = NULL;
-		GtkMenuItem* _tmp6_ = NULL;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = self->priv->page_move_left_menuitem;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE);
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = self->priv->page_move_right_menuitem;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE);
-#line 4198 "ui.c"
-	} else {
-		guint index = 0U;
-		Book* _tmp7_ = NULL;
-		Page* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		GtkMenuItem* _tmp10_ = NULL;
-		guint _tmp11_ = 0U;
-		GtkMenuItem* _tmp12_ = NULL;
-		guint _tmp13_ = 0U;
-		Book* _tmp14_ = NULL;
-		guint _tmp15_ = 0U;
-		guint _tmp16_ = 0U;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = self->priv->_book;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = page;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = book_get_page_index (_tmp7_, _tmp8_);
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		index = _tmp9_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = self->priv->page_move_left_menuitem;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = index;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ > ((guint) 0));
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = self->priv->page_move_right_menuitem;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = index;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = self->priv->_book;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = book_get_n_pages (_tmp14_);
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = _tmp15_;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
-#line 4237 "ui.c"
-	}
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 4241 "ui.c"
-}
-
-
-static void user_interface_page_selected_cb (UserInterface* self, BookView* view, Page* page) {
-	Page* _tmp0_ = NULL;
-	GtkRadioMenuItem* menuitem = NULL;
-	GtkRadioMenuItem* _tmp1_ = NULL;
-	GtkRadioMenuItem* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	GtkRadioMenuItem* _tmp31_ = NULL;
-	GtkToggleButton* _tmp32_ = NULL;
-	Page* _tmp33_ = NULL;
-	gboolean _tmp34_ = FALSE;
-	gboolean _tmp35_ = FALSE;
-	GtkToggleToolButton* _tmp36_ = NULL;
-	Page* _tmp37_ = NULL;
-	gboolean _tmp38_ = FALSE;
-	gboolean _tmp39_ = FALSE;
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (view != NULL);
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = page;
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_ == NULL) {
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4272 "ui.c"
-	}
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->updating_page_menu = TRUE;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_update_page_menu (self);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->no_crop_menuitem;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	menuitem = _tmp2_;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page_get_has_crop (_tmp3_);
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _tmp4_;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp5_) {
-#line 4292 "ui.c"
-		gchar* crop_name = NULL;
-		Page* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = page;
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = page_get_crop_name (_tmp6_);
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = _tmp7_;
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = g_strdup (_tmp8_);
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		crop_name = _tmp9_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = crop_name;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp10_ != NULL) {
-#line 4313 "ui.c"
-			const gchar* _tmp11_ = NULL;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp11_ = crop_name;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (g_strcmp0 (_tmp11_, "A4") == 0) {
-#line 4319 "ui.c"
-				GtkRadioMenuItem* _tmp12_ = NULL;
-				GtkRadioMenuItem* _tmp13_ = NULL;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp12_ = self->priv->a4_menuitem;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_object_unref0 (menuitem);
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				menuitem = _tmp13_;
-#line 4330 "ui.c"
-			} else {
-				const gchar* _tmp14_ = NULL;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp14_ = crop_name;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp14_, "A5") == 0) {
-#line 4337 "ui.c"
-					GtkRadioMenuItem* _tmp15_ = NULL;
-					GtkRadioMenuItem* _tmp16_ = NULL;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp15_ = self->priv->a5_menuitem;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_g_object_unref0 (menuitem);
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					menuitem = _tmp16_;
-#line 4348 "ui.c"
-				} else {
-					const gchar* _tmp17_ = NULL;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp17_ = crop_name;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (g_strcmp0 (_tmp17_, "A6") == 0) {
-#line 4355 "ui.c"
-						GtkRadioMenuItem* _tmp18_ = NULL;
-						GtkRadioMenuItem* _tmp19_ = NULL;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp18_ = self->priv->a6_menuitem;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_g_object_unref0 (menuitem);
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						menuitem = _tmp19_;
-#line 4366 "ui.c"
-					} else {
-						const gchar* _tmp20_ = NULL;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp20_ = crop_name;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						if (g_strcmp0 (_tmp20_, "letter") == 0) {
-#line 4373 "ui.c"
-							GtkRadioMenuItem* _tmp21_ = NULL;
-							GtkRadioMenuItem* _tmp22_ = NULL;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp21_ = self->priv->letter_menuitem;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp22_ = _g_object_ref0 (_tmp21_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_g_object_unref0 (menuitem);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							menuitem = _tmp22_;
-#line 4384 "ui.c"
-						} else {
-							const gchar* _tmp23_ = NULL;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp23_ = crop_name;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (g_strcmp0 (_tmp23_, "legal") == 0) {
-#line 4391 "ui.c"
-								GtkRadioMenuItem* _tmp24_ = NULL;
-								GtkRadioMenuItem* _tmp25_ = NULL;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp24_ = self->priv->legal_menuitem;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_g_object_unref0 (menuitem);
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								menuitem = _tmp25_;
-#line 4402 "ui.c"
-							} else {
-								const gchar* _tmp26_ = NULL;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp26_ = crop_name;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								if (g_strcmp0 (_tmp26_, "4x6") == 0) {
-#line 4409 "ui.c"
-									GtkRadioMenuItem* _tmp27_ = NULL;
-									GtkRadioMenuItem* _tmp28_ = NULL;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									_tmp27_ = self->priv->four_by_six_menuitem;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									_g_object_unref0 (menuitem);
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									menuitem = _tmp28_;
-#line 4420 "ui.c"
-								}
-							}
-						}
-					}
-				}
-			}
-		} else {
-			GtkRadioMenuItem* _tmp29_ = NULL;
-			GtkRadioMenuItem* _tmp30_ = NULL;
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp29_ = self->priv->custom_crop_menuitem;
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp30_ = _g_object_ref0 (_tmp29_);
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_object_unref0 (menuitem);
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			menuitem = _tmp30_;
-#line 4438 "ui.c"
-		}
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (crop_name);
-#line 4442 "ui.c"
-	}
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = menuitem;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp31_, TRUE);
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = self->priv->crop_button;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = page;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = page_get_has_crop (_tmp33_);
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = _tmp34_;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_toggle_button_set_active (_tmp32_, _tmp35_);
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp36_ = self->priv->crop_toolbutton;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp37_ = page;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp38_ = page_get_has_crop (_tmp37_);
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp39_ = _tmp38_;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_toggle_tool_button_set_active (_tmp36_, _tmp39_);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->updating_page_menu = FALSE;
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (menuitem);
-#line 4472 "ui.c"
-}
-
-
-static void user_interface_show_page_cb (UserInterface* self, BookView* view, Page* page) {
-	gchar* path = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GFile* file = NULL;
-	const gchar* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (view != NULL);
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (page != NULL);
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = get_temporary_filename ("scanned-page", "tiff");
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	path = _tmp0_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = path;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_ == NULL) {
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (path);
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4502 "ui.c"
-	}
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = path;
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	file = _tmp3_;
-#line 4510 "ui.c"
-	{
-		Page* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-		GFile* _tmp7_ = NULL;
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = page;
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = user_interface_get_quality (self);
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = _tmp5_;
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = file;
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_);
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4528 "ui.c"
-			goto __catch18_g_error;
-		}
-	}
-	goto __finally18;
-	__catch18_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = _ ("Unable to save image for preview");
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = e;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = _tmp9_->message;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error_dialog (self, _tmp8_, _tmp10_);
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (file);
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (path);
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4559 "ui.c"
-	}
-	__finally18:
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (file);
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (path);
-#line 985 "/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 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4574 "ui.c"
-	}
-	{
-		GdkScreen* _tmp11_ = NULL;
-		GdkScreen* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		guint32 _tmp16_ = 0U;
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = _tmp11_;
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = file;
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = g_file_get_uri (_tmp13_);
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = _tmp14_;
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = gtk_get_current_event_time ();
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_show_uri (_tmp12_, _tmp15_, _tmp16_, &_inner_error_);
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp15_);
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4601 "ui.c"
-			goto __catch19_g_error;
-		}
-	}
-	goto __finally19;
-	__catch19_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp17_ = NULL;
-		GError* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = _ ("Unable to open image preview application");
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp18_ = e;
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp19_ = _tmp18_->message;
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 4626 "ui.c"
-	}
-	__finally19:
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (file);
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (path);
-#line 997 "/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 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4641 "ui.c"
-	}
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (file);
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (path);
-#line 4647 "ui.c"
-}
-
-
-static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view) {
-	GtkMenu* _tmp0_ = NULL;
-	guint32 _tmp1_ = 0U;
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (view != NULL);
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->page_menu;
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_get_current_event_time ();
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) 3, _tmp1_);
-#line 4664 "ui.c"
-}
-
-
-static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-	gboolean _tmp0_ = FALSE;
-	Page* page = NULL;
-	BookView* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->updating_page_menu;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4686 "ui.c"
-	}
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->book_view;
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp4_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp5_ != NULL) {
-#line 4702 "ui.c"
-		Page* _tmp6_ = NULL;
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = page;
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_rotate_left (_tmp6_);
-#line 4708 "ui.c"
-	}
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 4712 "ui.c"
-}
-
-
-static void _user_interface_rotate_left_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_rotate_left_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4719 "ui.c"
-}
-
-
-static void user_interface_rotate_right_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-	gboolean _tmp0_ = FALSE;
-	Page* page = NULL;
-	BookView* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->updating_page_menu;
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4741 "ui.c"
-	}
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->book_view;
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp4_;
-#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page;
-#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp5_ != NULL) {
-#line 4757 "ui.c"
-		Page* _tmp6_ = NULL;
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = page;
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_rotate_right (_tmp6_);
-#line 4763 "ui.c"
-	}
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 4767 "ui.c"
-}
-
-
-static void _user_interface_rotate_right_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_rotate_right_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4774 "ui.c"
-}
-
-
-static void user_interface_set_crop (UserInterface* self, const gchar* crop_name) {
-	GtkMenuItem* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	Page* page = NULL;
-	BookView* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-	Page* _tmp6_ = NULL;
-	Page* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->crop_rotate_menuitem;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = crop_name;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_ != NULL);
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->updating_page_menu;
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4803 "ui.c"
-	}
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->book_view;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _tmp4_;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = _page_ref0 (_tmp5_);
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp6_;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = page;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp7_ == NULL) {
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1044: Trying to set crop but no selected page");
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_page_unref0 (page);
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4825 "ui.c"
-	}
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = crop_name;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp8_ == NULL) {
-#line 4831 "ui.c"
-		Page* _tmp9_ = NULL;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = page;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_set_no_crop (_tmp9_);
-#line 4837 "ui.c"
-	} else {
-		const gchar* _tmp10_ = NULL;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = crop_name;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (g_strcmp0 (_tmp10_, "custom") == 0) {
-#line 4844 "ui.c"
-			gint width = 0;
-			Page* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
-			gint height = 0;
-			Page* _tmp14_ = NULL;
-			gint _tmp15_ = 0;
-			gint _tmp16_ = 0;
-			gint crop_width = 0;
-			gint _tmp17_ = 0;
-			gint crop_height = 0;
-			gint _tmp18_ = 0;
-			Page* _tmp19_ = NULL;
-			gint _tmp20_ = 0;
-			gint _tmp21_ = 0;
-			Page* _tmp22_ = NULL;
-			gint _tmp23_ = 0;
-			gint _tmp24_ = 0;
-			gint _tmp25_ = 0;
-			gint _tmp26_ = 0;
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp11_ = page;
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp12_ = page_get_width (_tmp11_);
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp13_ = _tmp12_;
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			width = _tmp13_;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp14_ = page;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp15_ = page_get_height (_tmp14_);
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp16_ = _tmp15_;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			height = _tmp16_;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp17_ = width;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			crop_width = (gint) ((_tmp17_ * 0.8) + 0.5);
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp18_ = height;
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			crop_height = (gint) ((_tmp18_ * 0.8) + 0.5);
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp19_ = page;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp20_ = crop_width;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp21_ = crop_height;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			page_set_custom_crop (_tmp19_, _tmp20_, _tmp21_);
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp22_ = page;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp23_ = width;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp24_ = crop_width;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp25_ = height;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp26_ = crop_height;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2);
-#line 4909 "ui.c"
-		} else {
-			Page* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-#line 1060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp27_ = page;
-#line 1060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp28_ = crop_name;
-#line 1060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			page_set_named_crop (_tmp27_, _tmp28_);
-#line 4919 "ui.c"
-		}
-	}
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 4924 "ui.c"
-}
-
-
-static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = widget;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_crop (self, NULL);
-#line 4946 "ui.c"
-	}
-}
-
-
-static void _user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_no_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 4954 "ui.c"
-}
-
-
-static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = widget;
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_crop (self, "custom");
-#line 4976 "ui.c"
-	}
-}
-
-
-static void _user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_custom_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 4984 "ui.c"
-}
-
-
-static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggleButton* widget) {
-	gboolean _tmp0_ = FALSE;
-	GtkToggleButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->updating_page_menu;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 5003 "ui.c"
-	}
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = widget;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_toggle_button_get_active (_tmp1_);
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_) {
-#line 5013 "ui.c"
-		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5019 "ui.c"
-	} else {
-		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5026 "ui.c"
-	}
-}
-
-
-static void _user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_crop_button_toggled_cb ((UserInterface*) self, _sender);
-#line 5034 "ui.c"
-}
-
-
-static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkToggleToolButton* widget) {
-	gboolean _tmp0_ = FALSE;
-	GtkToggleToolButton* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->updating_page_menu;
-#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 5053 "ui.c"
-	}
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = widget;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_) {
-#line 5063 "ui.c"
-		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5069 "ui.c"
-	} else {
-		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5076 "ui.c"
-	}
-}
-
-
-static void _user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_crop_toolbutton_toggled_cb ((UserInterface*) self, _sender);
-#line 5084 "ui.c"
-}
-
-
-static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = widget;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_crop (self, "4x6");
-#line 5106 "ui.c"
-	}
-}
-
-
-static void _user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_four_by_six_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5114 "ui.c"
-}
-
-
-static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = widget;
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_crop (self, "legal");
-#line 5136 "ui.c"
-	}
-}
-
-
-static void _user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_legal_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5144 "ui.c"
-}
-
-
-static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = widget;
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_crop (self, "letter");
-#line 5166 "ui.c"
-	}
-}
-
-
-static void _user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_letter_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5174 "ui.c"
-}
-
-
-static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = widget;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_crop (self, "A6");
-#line 5196 "ui.c"
-	}
-}
-
-
-static void _user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_a6_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5204 "ui.c"
-}
-
-
-static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = widget;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_crop (self, "A5");
-#line 5226 "ui.c"
-	}
-}
-
-
-static void _user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_a5_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5234 "ui.c"
-}
-
-
-static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
-	GtkCheckMenuItem* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = widget;
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_crop (self, "A4");
-#line 5256 "ui.c"
-	}
-}
-
-
-static void _user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_a4_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5264 "ui.c"
-}
-
-
-static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-	Page* page = NULL;
-	BookView* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book_view;
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page;
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_ == NULL) {
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_page_unref0 (page);
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 5298 "ui.c"
-	}
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page;
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page_rotate_crop (_tmp5_);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 5306 "ui.c"
-}
-
-
-static void _user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_crop_rotate_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5313 "ui.c"
-}
-
-
-static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-	Page* page = NULL;
-	BookView* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	guint index = 0U;
-	Book* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	guint _tmp7_ = 0U;
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book_view;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->_book;
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page;
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = _tmp6_;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = index;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp7_ > ((guint) 0)) {
-#line 5354 "ui.c"
-		Book* _tmp8_ = NULL;
-		Page* _tmp9_ = NULL;
-		guint _tmp10_ = 0U;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = self->priv->_book;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = page;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = index;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
-#line 5366 "ui.c"
-	}
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 5370 "ui.c"
-}
-
-
-static void _user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_move_left_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5377 "ui.c"
-}
-
-
-static void user_interface_page_move_right_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-	Page* page = NULL;
-	BookView* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	guint index = 0U;
-	Book* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	guint _tmp7_ = 0U;
-	Book* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	guint _tmp10_ = 0U;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book_view;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->_book;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = _tmp6_;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = index;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = self->priv->_book;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = book_get_n_pages (_tmp8_);
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = _tmp9_;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp7_ < (_tmp10_ - 1)) {
-#line 5427 "ui.c"
-		Book* _tmp11_ = NULL;
-		Page* _tmp12_ = NULL;
-		Book* _tmp13_ = NULL;
-		Page* _tmp14_ = NULL;
-		guint _tmp15_ = 0U;
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = self->priv->_book;
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = page;
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = self->priv->_book;
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = page;
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = book_get_page_index (_tmp13_, _tmp14_);
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1);
-#line 5445 "ui.c"
-	}
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 5449 "ui.c"
-}
-
-
-static void _user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_move_right_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5456 "ui.c"
-}
-
-
-static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-	BookView* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-	Book* _tmp2_ = NULL;
-	BookView* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book_view;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_book (_tmp0_);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->book_view;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _tmp4_;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_delete_page (_tmp2_, _tmp5_);
-#line 5485 "ui.c"
-}
-
-
-static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_delete_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5492 "ui.c"
-}
-
-
-static Block2Data* block2_data_ref (Block2Data* _data2_) {
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_atomic_int_inc (&_data2_->_ref_count_);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return _data2_;
-#line 5501 "ui.c"
-}
-
-
-static void block2_data_unref (void * _userdata_) {
-	Block2Data* _data2_;
-	_data2_ = (Block2Data*) _userdata_;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 5510 "ui.c"
-		UserInterface* self;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self = _data2_->self;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data2_->dialog);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (self);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_slice_free (Block2Data, _data2_);
-#line 5520 "ui.c"
-	}
-}
-
-
-static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
-	UserInterface* self;
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	GdkEventKey* _tmp1_ = NULL;
-	GdkModifierType _tmp2_ = 0;
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data2_->self;
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (e != NULL, FALSE);
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = e;
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_->state;
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_ == 0) {
-#line 5541 "ui.c"
-		GdkEventKey* _tmp3_ = NULL;
-		guint _tmp4_ = 0U;
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = e;
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = _tmp3_->keyval;
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape);
-#line 5550 "ui.c"
-	} else {
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = FALSE;
-#line 5554 "ui.c"
-	}
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = TRUE;
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 5564 "ui.c"
-	}
-#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = FALSE;
-#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 5570 "ui.c"
-}
-
-
-static gboolean ___lambda6__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
-	gboolean result;
-	result = __lambda6_ (self, event);
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 5579 "ui.c"
-}
-
-
-static void __lambda7_ (Block2Data* _data2_) {
-	UserInterface* self;
-	Book* _tmp0_ = NULL;
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data2_->self;
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->_book;
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_combine_sides (_tmp0_);
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5594 "ui.c"
-}
-
-
-static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda7_ (self);
-#line 5601 "ui.c"
-}
-
-
-static void __lambda8_ (Block2Data* _data2_) {
-	UserInterface* self;
-	Book* _tmp0_ = NULL;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data2_->self;
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->_book;
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_combine_sides_reverse (_tmp0_);
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5616 "ui.c"
-}
-
-
-static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda8_ (self);
-#line 5623 "ui.c"
-}
-
-
-static void __lambda9_ (Block2Data* _data2_) {
-	UserInterface* self;
-	Book* _tmp0_ = NULL;
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data2_->self;
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->_book;
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_reverse (_tmp0_);
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5638 "ui.c"
-}
-
-
-static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda9_ (self);
-#line 5645 "ui.c"
-}
-
-
-static void __lambda10_ (Block2Data* _data2_) {
-	UserInterface* self;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data2_->self;
-#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5655 "ui.c"
-}
-
-
-static void ___lambda10__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda10_ (self);
-#line 5662 "ui.c"
-}
-
-
-static void user_interface_reorder_document (UserInterface* self) {
-	Block2Data* _data2_;
-	GtkWindow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkGrid* g = NULL;
-	GtkGrid* _tmp2_ = NULL;
-	GtkButton* b = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	GtkButton* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	GtkButton* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkButton* _tmp9_ = NULL;
-	GtkButton* _tmp10_ = NULL;
-	GtkButton* _tmp11_ = NULL;
-	GtkButton* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	GtkButton* _tmp14_ = NULL;
-	GtkButton* _tmp15_ = NULL;
-	GtkButton* _tmp16_ = NULL;
-	GtkButton* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	GtkButton* _tmp19_ = NULL;
-	GtkButton* _tmp20_ = NULL;
-	GtkButton* _tmp21_ = NULL;
-	GtkButton* _tmp22_ = NULL;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data2_ = g_slice_new0 (Block2Data);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data2_->_ref_count_ = 1;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data2_->self = g_object_ref (self);
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_TOPLEVEL);
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp0_);
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data2_->dialog = _tmp0_;
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_type_hint (_data2_->dialog, GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_modal (_data2_->dialog, TRUE);
-#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _data2_->dialog, (guint) 12);
-#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _ ("Reorder Pages");
-#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_title (_data2_->dialog, _tmp1_);
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for (_data2_->dialog, (GtkWindow*) self);
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data ((GtkWidget*) _data2_->dialog, "key-press-event", (GCallback) ___lambda6__gtk_widget_key_press_event, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _data2_->dialog, TRUE);
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = (GtkGrid*) gtk_grid_new ();
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp2_);
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g = _tmp2_;
-#line 1198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_set_row_homogeneous (g, TRUE);
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_set_row_spacing (g, 6);
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_set_column_homogeneous (g, TRUE);
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_set_column_spacing (g, 6);
-#line 1202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) g, TRUE);
-#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add ((GtkContainer*) _data2_->dialog, (GtkWidget*) g);
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _ ("Combine sides");
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = user_interface_make_reorder_button (self, _tmp3_, "F1F2F3B1B2B3-F1B1F2B2F3B3");
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	b = _tmp4_;
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = b;
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp5_, "clicked", (GCallback) ___lambda7__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = b;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = b;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_attach (g, (GtkWidget*) _tmp7_, 0, 0, 1, 1);
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = _ ("Combine sides (reverse)");
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = user_interface_make_reorder_button (self, _tmp8_, "F1F2F3B3B2B1-F1B1F2B2F3B3");
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (b);
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	b = _tmp9_;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = b;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp10_, "clicked", (GCallback) ___lambda8__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = b;
-#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = b;
-#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_attach (g, (GtkWidget*) _tmp12_, 1, 0, 1, 1);
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = _ ("Reverse");
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = user_interface_make_reorder_button (self, _tmp13_, "C1C2C3C4C5C6-C6C5C4C3C2C1");
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (b);
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	b = _tmp14_;
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = b;
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda9__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = b;
-#line 1232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp16_, TRUE);
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = b;
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_attach (g, (GtkWidget*) _tmp17_, 0, 2, 1, 1);
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = _ ("Keep unchanged");
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = user_interface_make_reorder_button (self, _tmp18_, "C1C2C3C4C5C6-C1C2C3C4C5C6");
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (b);
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	b = _tmp19_;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = b;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp20_, "clicked", (GCallback) ___lambda10__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = b;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp21_, TRUE);
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = b;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_attach (g, (GtkWidget*) _tmp22_, 1, 2, 1, 1);
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_present (_data2_->dialog);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (b);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (g);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	block2_data_unref (_data2_);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data2_ = NULL;
-#line 5829 "ui.c"
-}
-
-
-void user_interface_reorder_document_activate_cb (UserInterface* self) {
-#line 1247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_reorder_document (self);
-#line 5838 "ui.c"
-}
-
-
-static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_reorder_document (self);
-#line 5849 "ui.c"
-}
-
-
-static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_reorder_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5856 "ui.c"
-}
-
-
-static GtkButton* user_interface_make_reorder_button (UserInterface* self, const gchar* text, const gchar* items) {
-	GtkButton* result = NULL;
-	GtkButton* b = NULL;
-	GtkButton* _tmp0_ = NULL;
-	GtkBox* vbox = NULL;
-	GtkBox* _tmp1_ = NULL;
-	GtkLabel* label = NULL;
-	const gchar* _tmp2_ = NULL;
-	GtkLabel* _tmp3_ = NULL;
-	GtkBox* rb = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkBox* _tmp5_ = NULL;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (text != NULL, NULL);
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (items != NULL, NULL);
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = (GtkButton*) gtk_button_new ();
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp0_);
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	b = _tmp0_;
-#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp1_);
-#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	vbox = _tmp1_;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add ((GtkContainer*) b, (GtkWidget*) vbox);
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = text;
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = (GtkLabel*) gtk_label_new (_tmp2_);
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp3_);
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	label = _tmp3_;
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) label, TRUE);
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (vbox, (GtkWidget*) label, TRUE, TRUE, (guint) 0);
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = items;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = user_interface_make_reorder_box (self, _tmp4_);
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	rb = _tmp5_;
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) rb, TRUE);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (vbox, (GtkWidget*) rb, TRUE, TRUE, (guint) 0);
-#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = b;
-#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (rb);
-#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (label);
-#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (vbox);
-#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 5926 "ui.c"
-}
-
-
-static gchar string_get (const gchar* self, glong index) {
-	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 5944 "ui.c"
-}
-
-
-static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar* items) {
-	GtkBox* result = NULL;
-	GtkBox* box = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkBox* _tmp1_ = NULL;
-	GtkBox* page_box = NULL;
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (items != NULL, NULL);
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp0_);
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	box = _tmp0_;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = box;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page_box = NULL;
-#line 5970 "ui.c"
-	{
-		gint i = 0;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		i = 0;
-#line 5975 "ui.c"
-		{
-			gboolean _tmp2_ = FALSE;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp2_ = TRUE;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			while (TRUE) {
-#line 5982 "ui.c"
-				const gchar* _tmp4_ = NULL;
-				gint _tmp5_ = 0;
-				gchar _tmp6_ = '\0';
-				const gchar* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
-				gchar _tmp9_ = '\0';
-				gchar side = '\0';
-				const gchar* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				gchar _tmp16_ = '\0';
-				gint _tmp17_ = 0;
-				const gchar* _tmp18_ = NULL;
-				gint _tmp19_ = 0;
-				gchar _tmp20_ = '\0';
-				GtkBox* _tmp21_ = NULL;
-				gdouble r = 0.0;
-				gdouble g = 0.0;
-				gdouble b = 0.0;
-				gchar _tmp26_ = '\0';
-				gdouble _tmp33_ = 0.0;
-				gdouble _tmp34_ = 0.0;
-				gdouble _tmp35_ = 0.0;
-				gdouble _tmp36_ = 0.0;
-				gdouble _tmp37_ = 0.0;
-				gdouble _tmp38_ = 0.0;
-				PageIcon* icon = NULL;
-				const gchar* _tmp39_ = NULL;
-				gint _tmp40_ = 0;
-				gchar _tmp41_ = '\0';
-				gchar* _tmp42_ = NULL;
-				gchar* _tmp43_ = NULL;
-				gdouble _tmp44_ = 0.0;
-				gdouble _tmp45_ = 0.0;
-				gdouble _tmp46_ = 0.0;
-				PageIcon* _tmp47_ = NULL;
-				PageIcon* _tmp48_ = NULL;
-				PageIcon* _tmp49_ = NULL;
-				GtkBox* _tmp50_ = NULL;
-				PageIcon* _tmp51_ = NULL;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_tmp2_) {
-#line 6024 "ui.c"
-					gint _tmp3_ = 0;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp3_ = i;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					i = _tmp3_ + 1;
-#line 6030 "ui.c"
-				}
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp2_ = FALSE;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp4_ = items;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp5_ = i;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp6_ = string_get (_tmp4_, (glong) _tmp5_);
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!(_tmp6_ != '\0')) {
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					break;
-#line 6044 "ui.c"
-				}
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp7_ = items;
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp8_ = i;
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp9_ = string_get (_tmp7_, (glong) _tmp8_);
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp9_ == '-') {
-#line 6054 "ui.c"
-					GtkArrow* a = NULL;
-					GtkArrow* _tmp10_ = NULL;
-					GtkArrow* _tmp11_ = NULL;
-					GtkBox* _tmp12_ = NULL;
-					GtkArrow* _tmp13_ = NULL;
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp10_ = (GtkArrow*) gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					g_object_ref_sink (_tmp10_);
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					a = _tmp10_;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp11_ = a;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp12_ = box;
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp13_ = a;
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_box_pack_start (_tmp12_, (GtkWidget*) _tmp13_, FALSE, FALSE, (guint) 0);
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_g_object_unref0 (page_box);
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					page_box = NULL;
-#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_g_object_unref0 (a);
-#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					continue;
-#line 6084 "ui.c"
-				}
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp14_ = items;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp15_ = i;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp16_ = string_get (_tmp14_, (glong) _tmp15_);
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				side = _tmp16_;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp17_ = i;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				i = _tmp17_ + 1;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp18_ = items;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp19_ = i;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp20_ = string_get (_tmp18_, (glong) _tmp19_);
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp20_ == '\0') {
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					break;
-#line 6108 "ui.c"
-				}
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp21_ = page_box;
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp21_ == NULL) {
-#line 6114 "ui.c"
-					GtkBox* _tmp22_ = NULL;
-					GtkBox* _tmp23_ = NULL;
-					GtkBox* _tmp24_ = NULL;
-					GtkBox* _tmp25_ = NULL;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					g_object_ref_sink (_tmp22_);
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_g_object_unref0 (page_box);
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					page_box = _tmp22_;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp23_ = page_box;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_widget_set_visible ((GtkWidget*) _tmp23_, TRUE);
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp24_ = box;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp25_ = page_box;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0);
-#line 6137 "ui.c"
-				}
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				r = 1.0;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				g = 1.0;
-#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				b = 1.0;
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp26_ = side;
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				switch (_tmp26_) {
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					case 'F':
-#line 6151 "ui.c"
-					{
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						r = 0x75 / 255.0;
-#line 1316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						g = 0x50 / 255.0;
-#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						b = 0x7B / 255.0;
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						break;
-#line 6161 "ui.c"
-					}
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					case 'B':
-#line 6165 "ui.c"
-					{
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						r = 0xF5 / 255.0;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						g = 0x79 / 255.0;
-#line 1323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						b = 0.0;
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						break;
-#line 6175 "ui.c"
-					}
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					case 'C':
-#line 6179 "ui.c"
-					{
-						gdouble p = 0.0;
-						const gchar* _tmp27_ = NULL;
-						gint _tmp28_ = 0;
-						gchar _tmp29_ = '\0';
-						gdouble _tmp30_ = 0.0;
-						gdouble _tmp31_ = 0.0;
-						gdouble _tmp32_ = 0.0;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp27_ = items;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp28_ = i;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						p = (_tmp29_ - '1') / 5.0;
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp30_ = p;
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp31_ = p;
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						r = ((0xED / 255.0) * (1 - _tmp30_)) + (0xCC * _tmp31_);
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp32_ = p;
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						g = (0xD4 / 255.0) * (1 - _tmp32_);
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						b = (gdouble) 0;
-#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						break;
-#line 6210 "ui.c"
-					}
-					default:
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					break;
-#line 6215 "ui.c"
-				}
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp33_ = r;
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp34_ = r;
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				r = _tmp33_ + ((1.0 - _tmp34_) * 0.7);
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp35_ = g;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp36_ = g;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				g = _tmp35_ + ((1.0 - _tmp36_) * 0.7);
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp37_ = b;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp38_ = b;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				b = _tmp37_ + ((1.0 - _tmp38_) * 0.7);
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp39_ = items;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp40_ = i;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp42_ = g_strdup_printf ("%c", (gint) _tmp41_);
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp43_ = _tmp42_;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp44_ = r;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp45_ = g;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp46_ = b;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp47_ = page_icon_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				g_object_ref_sink (_tmp47_);
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp48_ = _tmp47_;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (_tmp43_);
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				icon = _tmp48_;
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp49_ = icon;
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp50_ = page_box;
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp51_ = icon;
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_box_pack_start (_tmp50_, (GtkWidget*) _tmp51_, FALSE, FALSE, (guint) 0);
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_object_unref0 (icon);
-#line 6273 "ui.c"
-			}
-		}
-	}
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = box;
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (page_box);
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 6283 "ui.c"
-}
-
-
-static void user_interface_save_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_document (self, FALSE);
-#line 6294 "ui.c"
-}
-
-
-static void _user_interface_save_file_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_file_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6301 "ui.c"
-}
-
-
-void user_interface_save_document_activate_cb (UserInterface* self) {
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_document (self, FALSE);
-#line 6310 "ui.c"
-}
-
-
-static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-	Page* page = NULL;
-	BookView* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book_view;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_ != NULL) {
-#line 6339 "ui.c"
-		Page* _tmp5_ = NULL;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = page;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_copy_to_clipboard (_tmp5_, (GtkWindow*) self);
-#line 6345 "ui.c"
-	}
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 6349 "ui.c"
-}
-
-
-static void _user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_copy_to_clipboard_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6356 "ui.c"
-}
-
-
-static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_document (self, TRUE);
-#line 6367 "ui.c"
-}
-
-
-static void _user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_as_file_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6374 "ui.c"
-}
-
-
-void user_interface_save_as_document_activate_cb (UserInterface* self) {
-#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_document (self, TRUE);
-#line 6383 "ui.c"
-}
-
-
-static gpointer _cairo_reference0 (gpointer self) {
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self ? cairo_reference (self) : NULL;
-#line 6390 "ui.c"
-}
-
-
-static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* operation, GtkPrintContext* print_context, gint page_number) {
-	cairo_t* context = NULL;
-	GtkPrintContext* _tmp0_ = NULL;
-	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_ = NULL;
-	Page* page = NULL;
-	Book* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	Page* _tmp5_ = NULL;
-	gboolean is_landscape = FALSE;
-	GtkPrintContext* _tmp6_ = NULL;
-	gdouble _tmp7_ = 0.0;
-	GtkPrintContext* _tmp8_ = NULL;
-	gdouble _tmp9_ = 0.0;
-	Page* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	cairo_t* _tmp18_ = NULL;
-	GtkPrintContext* _tmp19_ = NULL;
-	gdouble _tmp20_ = 0.0;
-	Page* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	gint _tmp23_ = 0;
-	GtkPrintContext* _tmp24_ = NULL;
-	gdouble _tmp25_ = 0.0;
-	Page* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	gint _tmp28_ = 0;
-	GdkPixbuf* image = NULL;
-	Page* _tmp29_ = NULL;
-	GdkPixbuf* _tmp30_ = NULL;
-	cairo_t* _tmp31_ = NULL;
-	cairo_t* _tmp32_ = NULL;
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (operation != NULL);
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (print_context != NULL);
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = print_context;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	context = _tmp2_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->_book;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page_number;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = book_get_page (_tmp3_, _tmp4_);
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp5_;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	is_landscape = FALSE;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = print_context;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = gtk_print_context_get_width (_tmp6_);
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = print_context;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = gtk_print_context_get_height (_tmp8_);
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp7_ > _tmp9_) {
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		is_landscape = TRUE;
-#line 6464 "ui.c"
-	}
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = page;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = page_get_is_landscape (_tmp10_);
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = _tmp11_;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = is_landscape;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp12_ != _tmp13_) {
-#line 6476 "ui.c"
-		cairo_t* _tmp14_ = NULL;
-		GtkPrintContext* _tmp15_ = NULL;
-		gdouble _tmp16_ = 0.0;
-		cairo_t* _tmp17_ = NULL;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = context;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = print_context;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = gtk_print_context_get_width (_tmp15_);
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		cairo_translate (_tmp14_, _tmp16_, (gdouble) 0);
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = context;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		cairo_rotate (_tmp17_, G_PI_2);
-#line 6493 "ui.c"
-	}
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = context;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = print_context;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = gtk_print_context_get_dpi_x (_tmp19_);
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = page;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = page_get_dpi (_tmp21_);
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = _tmp22_;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = print_context;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = gtk_print_context_get_dpi_y (_tmp24_);
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = page;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = page_get_dpi (_tmp26_);
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = _tmp27_;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_scale (_tmp18_, _tmp20_ / _tmp23_, _tmp25_ / _tmp28_);
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = page;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = page_get_image (_tmp29_, TRUE);
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	image = _tmp30_;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = context;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gdk_cairo_set_source_pixbuf (_tmp31_, image, (gdouble) 0, (gdouble) 0);
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = context;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_paint (_tmp32_);
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (image);
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (page);
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_cairo_destroy0 (context);
-#line 6539 "ui.c"
-}
-
-
-static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->document_hint;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_quality (self);
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6559 "ui.c"
-}
-
-
-static void _user_interface_email_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_email_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6566 "ui.c"
-}
-
-
-void user_interface_email_document_activate_cb (UserInterface* self) {
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->document_hint;
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_quality (self);
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6584 "ui.c"
-}
-
-
-static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_draw_page ((UserInterface*) self, _sender, context, page_nr);
-#line 6591 "ui.c"
-}
-
-
-static void user_interface_print_document (UserInterface* self) {
-	GtkPrintOperation* print = NULL;
-	GtkPrintOperation* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	guint _tmp6_ = 0U;
-	GError * _inner_error_ = NULL;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = gtk_print_operation_new ();
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	print = _tmp0_;
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->_book;
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_set (print, "n-pages", (gint) _tmp3_, NULL);
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (print, "draw-page", (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self, 0);
-#line 6619 "ui.c"
-	{
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, (GtkWindow*) self, &_inner_error_);
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6625 "ui.c"
-			goto __catch20_g_error;
-		}
-	}
-	goto __finally20;
-	__catch20_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = e;
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _tmp4_->message;
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1425: Error printing: %s", _tmp5_);
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 6647 "ui.c"
-	}
-	__finally20:
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (print);
-#line 1419 "/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 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 6660 "ui.c"
-	}
-#line 1428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("draw-page", gtk_print_operation_get_type (), &_tmp6_, NULL, FALSE);
-#line 1428 "/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 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (print);
-#line 6668 "ui.c"
-}
-
-
-static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_print_document (self);
-#line 6679 "ui.c"
-}
-
-
-static void _user_interface_print_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_print_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6686 "ui.c"
-}
-
-
-void user_interface_print_document_activate_cb (UserInterface* self) {
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_print_document (self);
-#line 6695 "ui.c"
-}
-
-
-static void user_interface_launch_help (UserInterface* self) {
-	GError * _inner_error_ = NULL;
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 6703 "ui.c"
-	{
-		GdkScreen* _tmp0_ = NULL;
-		GdkScreen* _tmp1_ = NULL;
-		guint32 _tmp2_ = 0U;
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = _tmp0_;
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = gtk_get_current_event_time ();
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6718 "ui.c"
-			goto __catch21_g_error;
-		}
-	}
-	goto __finally21;
-	__catch21_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = _ ("Unable to open help file");
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = e;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _tmp4_->message;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 6743 "ui.c"
-	}
-	__finally21:
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1444 "/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 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 6754 "ui.c"
-	}
-}
-
-
-static void user_interface_help_contents_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_launch_help (self);
-#line 6766 "ui.c"
-}
-
-
-static void _user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_help_contents_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6773 "ui.c"
-}
-
-
-void user_interface_help_contents_activate_cb (UserInterface* self) {
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_launch_help (self);
-#line 6782 "ui.c"
-}
-
-
-static void user_interface_show_about (UserInterface* self) {
-	gchar** authors = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gint authors_length1 = 0;
-	gint _authors_size_ = 0;
-	gchar* license = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* title = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* description = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = g_strdup ("Robert Ancell <robert.ancell@canonical.com>");
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_new0 (gchar*, 1 + 1);
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_[0] = _tmp0_;
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	authors = _tmp1_;
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	authors_length1 = 1;
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_authors_size_ = authors_length1;
-#line 1472 "/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" \
-"(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/>.");
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	license = _tmp3_;
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _ ("About Simple Scan");
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	title = _tmp5_;
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = _ ("Simple document scanning tool");
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = g_strdup (_tmp6_);
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	description = _tmp7_;
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = _ ("translator-credits");
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_show_about_dialog ((GtkWindow*) self, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp8_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2015 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (description);
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (title);
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (license);
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 6846 "ui.c"
-}
-
-
-static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_show_about (self);
-#line 6857 "ui.c"
-}
-
-
-static void _user_interface_about_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_about_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6864 "ui.c"
-}
-
-
-void user_interface_about_activate_cb (UserInterface* self) {
-#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_show_about (self);
-#line 6873 "ui.c"
-}
-
-
-static gboolean user_interface_on_quit (UserInterface* self) {
-	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	guint _tmp3_ = 0U;
-	AutosaveManager* _tmp4_ = NULL;
-#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = _ ("Save document before quitting?");
-#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _ ("Quit without Saving");
-#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp2_) {
-#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = FALSE;
-#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 6898 "ui.c"
-	}
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) self);
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->save_state_timeout;
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_ != ((guint) 0)) {
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_save_state (self, TRUE);
-#line 6908 "ui.c"
-	}
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->autosave_manager;
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	autosave_manager_cleanup (_tmp4_);
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = TRUE;
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 6918 "ui.c"
-}
-
-
-static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_on_quit (self);
-#line 6929 "ui.c"
-}
-
-
-static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_quit_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6936 "ui.c"
-}
-
-
-void user_interface_quit_activate_cb (UserInterface* self) {
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_on_quit (self);
-#line 6945 "ui.c"
-}
-
-
-static void user_interface_real_size_allocate (GtkWidget* base, GtkAllocation* allocation) {
-	UserInterface * self;
-	GtkAllocation _tmp0_ = {0};
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (UserInterface*) base;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (allocation != NULL);
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = *allocation;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	GTK_WIDGET_CLASS (user_interface_parent_class)->size_allocate ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), &_tmp0_);
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->window_is_maximized;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp2_) {
-#line 6966 "ui.c"
-		gboolean _tmp3_ = FALSE;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->window_is_fullscreen;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = !_tmp3_;
-#line 6972 "ui.c"
-	} else {
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = FALSE;
-#line 6976 "ui.c"
-	}
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 6980 "ui.c"
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_window_get_size ((GtkWindow*) self, &_tmp4_, &_tmp5_);
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_width = _tmp4_;
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_height = _tmp5_;
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_save_state (self, FALSE);
-#line 6991 "ui.c"
-	}
-}
-
-
-static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id) {
-	gint _tmp0_ = 0;
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = response_id;
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (_tmp0_) {
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case 1:
-#line 7008 "ui.c"
-		{
-			GtkComboBox* _tmp1_ = NULL;
-			GtkDialog* _tmp2_ = NULL;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp1_ = self->priv->device_combo;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp2_ = self->priv->preferences_dialog;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_window_present ((GtkWindow*) _tmp2_);
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			break;
-#line 7022 "ui.c"
-		}
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case 2:
-#line 7026 "ui.c"
-		{
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			user_interface_install_drivers (self);
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			break;
-#line 7032 "ui.c"
-		}
-		default:
-		{
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			self->priv->have_error = FALSE;
-#line 1561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (self->priv->error_title);
-#line 1561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			self->priv->error_title = NULL;
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (self->priv->error_text);
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			self->priv->error_text = NULL;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			user_interface_update_info_bar (self);
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			break;
-#line 7050 "ui.c"
-		}
-	}
-}
-
-
-static Block3Data* block3_data_ref (Block3Data* _data3_) {
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_atomic_int_inc (&_data3_->_ref_count_);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return _data3_;
-#line 7061 "ui.c"
-}
-
-
-static void block3_data_unref (void * _userdata_) {
-	Block3Data* _data3_;
-	_data3_ = (Block3Data*) _userdata_;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 7070 "ui.c"
-		UserInterface* self;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self = _data3_->self;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data3_->instructions_label);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data3_->status_label);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data3_->spinner);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data3_->stack);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (self);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_slice_free (Block3Data, _data3_);
-#line 7086 "ui.c"
-	}
-}
-
-
-static void ___lambda12_ (UserInterface* self) {
-}
-
-
-static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self) {
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	___lambda12_ ((UserInterface*) self);
-#line 7098 "ui.c"
-}
-
-
-static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _result_) {
-	UserInterface* self;
-	GtkLabel* _tmp0_ = NULL;
-	GtkSpinner* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	GtkStack* _tmp3_ = NULL;
-	GtkLabel* _tmp4_ = NULL;
-	gchar* result_text = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GtkLabel* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data3_->self;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (_result_ != NULL);
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = _data3_->status_label;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _data3_->spinner;
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_set (_tmp1_, "active", FALSE, NULL);
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _data3_->status_label;
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_text (_tmp2_, "☒");
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _data3_->stack;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _data3_->status_label;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_stack_set_visible_child (_tmp3_, (GtkWidget*) _tmp4_);
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _ ("Drivers installed successfully!");
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result_text = _tmp6_;
-#line 7143 "ui.c"
-	{
-		PkResults* results = NULL;
-		GAsyncResult* _tmp7_ = NULL;
-		PkResults* _tmp8_ = NULL;
-		PkError* _tmp9_ = NULL;
-		PkError* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = _result_;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = user_interface_install_packages_finish (self, _tmp7_, &_inner_error_);
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		results = _tmp8_;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7159 "ui.c"
-			goto __catch22_g_error;
-		}
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = pk_results_get_error_code (results);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = _tmp9_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = _tmp10_ == NULL;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_tmp10_);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp11_) {
-#line 7172 "ui.c"
-			GtkLabel* _tmp12_ = NULL;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp12_ = _data3_->status_label;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_label_set_text (_tmp12_, "☑");
-#line 7178 "ui.c"
-		} else {
-			PkError* e = NULL;
-			PkError* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			PkError* _tmp15_ = NULL;
-			PkErrorEnum _tmp16_ = 0;
-			PkErrorEnum _tmp17_ = 0;
-			gchar* _tmp18_ = NULL;
-#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp13_ = pk_results_get_error_code (results);
-#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			e = _tmp13_;
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp14_ = _ ("Failed to install drivers (error code %d).");
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp15_ = e;
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_object_get (_tmp15_, "code", &_tmp16_, NULL);
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp17_ = _tmp16_;
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp18_ = g_strdup_printf (_tmp14_, _tmp17_);
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (result_text);
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			result_text = _tmp18_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_object_unref0 (e);
-#line 7207 "ui.c"
-		}
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (results);
-#line 7211 "ui.c"
-	}
-	goto __finally22;
-	__catch22_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		GError* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp19_ = _ ("Failed to install drivers.");
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp20_ = g_strdup (_tmp19_);
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (result_text);
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result_text = _tmp20_;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp21_ = e;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp22_ = _tmp21_->message;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1670: Failed to install drivers: %s", _tmp22_);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 7241 "ui.c"
-	}
-	__finally22:
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (result_text);
-#line 1654 "/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 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 7254 "ui.c"
-	}
-#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = _data3_->instructions_label;
-#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = result_text;
-#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_text (_tmp23_, _tmp24_);
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (result_text);
-#line 7264 "ui.c"
-}
-
-
-static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	___lambda13_ (self, source_object, res);
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	block3_data_unref (self);
-#line 7273 "ui.c"
-}
-
-
-static void user_interface_install_drivers (UserInterface* self) {
-	Block3Data* _data3_;
-	gchar* message = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* instructions = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** packages_to_install = NULL;
-	gchar** _tmp2_ = NULL;
-	gint packages_to_install_length1 = 0;
-	gint _packages_to_install_size_ = 0;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GQuark _tmp6_ = 0U;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp5_label0 = 0;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp5_label1 = 0;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp5_label2 = 0;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp5_label3 = 0;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp5_label4 = 0;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp5_label5 = 0;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp5_label6 = 0;
-#line 7304 "ui.c"
-	GtkDialog* dialog = NULL;
-	const gchar* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	GtkDialog* _tmp25_ = NULL;
-	GtkDialog* _tmp26_ = NULL;
-	GtkBox* _tmp27_ = NULL;
-	GtkDialog* _tmp28_ = NULL;
-	GtkBox* _tmp29_ = NULL;
-	GtkLabel* label = NULL;
-	const gchar* _tmp30_ = NULL;
-	GtkLabel* _tmp31_ = NULL;
-	GtkLabel* _tmp32_ = NULL;
-	GtkLabel* _tmp33_ = NULL;
-	GtkDialog* _tmp34_ = NULL;
-	GtkBox* _tmp35_ = NULL;
-	GtkLabel* _tmp36_ = NULL;
-	GtkBox* instructions_box = NULL;
-	GtkBox* _tmp37_ = NULL;
-	GtkBox* _tmp38_ = NULL;
-	GtkDialog* _tmp39_ = NULL;
-	GtkBox* _tmp40_ = NULL;
-	GtkBox* _tmp41_ = NULL;
-	GtkStack* _tmp42_ = NULL;
-	GtkBox* _tmp43_ = NULL;
-	GtkStack* _tmp44_ = NULL;
-	GtkSpinner* _tmp45_ = NULL;
-	GtkSpinner* _tmp46_ = NULL;
-	GtkStack* _tmp47_ = NULL;
-	GtkSpinner* _tmp48_ = NULL;
-	GtkLabel* _tmp49_ = NULL;
-	GtkLabel* _tmp50_ = NULL;
-	GtkStack* _tmp51_ = NULL;
-	GtkLabel* _tmp52_ = NULL;
-	const gchar* _tmp53_ = NULL;
-	GtkLabel* _tmp54_ = NULL;
-	GtkLabel* _tmp55_ = NULL;
-	GtkLabel* _tmp56_ = NULL;
-	GtkLabel* _tmp57_ = NULL;
-	GtkBox* _tmp58_ = NULL;
-	GtkLabel* _tmp59_ = NULL;
-	const gchar* _tmp60_ = NULL;
-	GtkLabel* _tmp61_ = NULL;
-	GtkLabel* _tmp62_ = NULL;
-	GtkLabel* _tmp63_ = NULL;
-	GtkDialog* _tmp64_ = NULL;
-	GtkBox* _tmp65_ = NULL;
-	GtkDialog* _tmp66_ = NULL;
-	GtkBox* _tmp67_ = NULL;
-	GtkLabel* _tmp68_ = NULL;
-	gchar** _tmp69_ = NULL;
-	gint _tmp69__length1 = 0;
-	GtkDialog* _tmp75_ = NULL;
-	GtkDialog* _tmp76_ = NULL;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_ = g_slice_new0 (Block3Data);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->_ref_count_ = 1;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->self = g_object_ref (self);
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = g_strdup ("");
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	message = _tmp0_;
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup ("");
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	instructions = _tmp1_;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = g_new0 (gchar*, 0 + 1);
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	packages_to_install = _tmp2_;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	packages_to_install_length1 = 0;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_packages_to_install_size_ = packages_to_install_length1;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->missing_driver;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _tmp3_;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = (NULL == _tmp4_) ? 0 : g_quark_from_string (_tmp4_);
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if ((((_tmp6_ == ((0 != _tmp5_label0) ? _tmp5_label0 : (_tmp5_label0 = g_quark_from_static_string ("brscan")))) || (_tmp6_ == ((0 != _tmp5_label1) ? _tmp5_label1 : (_tmp5_label1 = g_quark_from_static_string ("brscan2"))))) || (_tmp6_ == ((0 != _tmp5_label2) ? _tmp5_label2 : (_tmp5_label2 = g_quark_from_static_string ("brscan3"))))) || (_tmp6_ == ((0 != _tmp5_label3) ? _tmp5_label3 : (_tmp5_label3 = g_quark_from_static_string ("brscan4"))))) {
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		switch (0) {
-#line 7392 "ui.c"
-			default:
-			{
-				const gchar* _tmp7_ = NULL;
-				gchar* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp7_ = _ ("You appear to have a Brother scanner.");
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp8_ = g_strdup (_tmp7_);
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (message);
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				message = _tmp8_;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp9_ = _ ("Drivers for this are available on the <a href=\"http://support.brother" \
-".com\">Brother website</a>.");
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp10_ = g_strdup (_tmp9_);
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (instructions);
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				instructions = _tmp10_;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 7417 "ui.c"
-			}
-		}
-	} else if (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("samsung")))) {
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		switch (0) {
-#line 7423 "ui.c"
-			default:
-			{
-				const gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				const gchar* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-#line 1585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp11_ = _ ("You appear to have a Samsung scanner.");
-#line 1585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp12_ = g_strdup (_tmp11_);
-#line 1585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (message);
-#line 1585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				message = _tmp12_;
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp13_ = _ ("Drivers for this are available on the <a href=\"http://samsung.com/sup" \
-"port\">Samsung website</a>.");
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp14_ = g_strdup (_tmp13_);
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (instructions);
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				instructions = _tmp14_;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 7448 "ui.c"
-			}
-		}
-	} else if (_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("hpaio")))) {
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		switch (0) {
-#line 7454 "ui.c"
-			default:
-			{
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				gchar** _tmp18_ = NULL;
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp15_ = _ ("You appear to have an HP scanner.");
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp16_ = g_strdup (_tmp15_);
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (message);
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				message = _tmp16_;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp17_ = g_strdup ("libsane-hpaio");
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp18_ = g_new0 (gchar*, 1 + 1);
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp18_[0] = _tmp17_;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				packages_to_install = (_vala_array_free (packages_to_install, packages_to_install_length1, (GDestroyNotify) g_free), NULL);
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				packages_to_install = _tmp18_;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				packages_to_install_length1 = 1;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_packages_to_install_size_ = packages_to_install_length1;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 7485 "ui.c"
-			}
-		}
-	} else if (_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("epkowa")))) {
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		switch (0) {
-#line 7491 "ui.c"
-			default:
-			{
-				const gchar* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp19_ = _ ("You appear to have an Epson scanner.");
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp20_ = g_strdup (_tmp19_);
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (message);
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				message = _tmp20_;
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp21_ = _ ("Drivers for this are available on the <a href=\"http://support.epson.c" \
-"om\">Epson website</a>.");
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp22_ = g_strdup (_tmp21_);
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (instructions);
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				instructions = _tmp22_;
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 7516 "ui.c"
-			}
-		}
-	}
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = _ ("Install drivers");
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = _ ("_Close");
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp23_, (GtkWindow*) self, GTK_DIALOG_MODAL, _tmp24_, GTK_RESPONSE_CLOSE, NULL);
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp25_);
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dialog = _tmp25_;
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = dialog;
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = (GtkBox*) gtk_dialog_get_content_area (_tmp26_);
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _tmp27_, (guint) 12);
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = dialog;
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = (GtkBox*) gtk_dialog_get_content_area (_tmp28_);
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_set_spacing (_tmp29_, 6);
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = message;
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = (GtkLabel*) gtk_label_new (_tmp30_);
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp31_);
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	label = _tmp31_;
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = label;
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp32_, TRUE);
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = label;
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_xalign (_tmp33_, 0.f);
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = dialog;
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = (GtkBox*) gtk_dialog_get_content_area (_tmp34_);
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp36_ = label;
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp35_, (GtkWidget*) _tmp36_, TRUE, TRUE, (guint) 0);
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp37_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp37_);
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	instructions_box = _tmp37_;
-#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp38_ = instructions_box;
-#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp38_, TRUE);
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp39_ = dialog;
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = (GtkBox*) gtk_dialog_get_content_area (_tmp39_);
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp41_ = instructions_box;
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp40_, (GtkWidget*) _tmp41_, TRUE, TRUE, (guint) 0);
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp42_ = (GtkStack*) gtk_stack_new ();
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp42_);
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->stack = _tmp42_;
-#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp43_ = instructions_box;
-#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp44_ = _data3_->stack;
-#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp43_, (GtkWidget*) _tmp44_, FALSE, FALSE, (guint) 0);
-#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp45_ = (GtkSpinner*) gtk_spinner_new ();
-#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp45_);
-#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->spinner = _tmp45_;
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp46_ = _data3_->spinner;
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp46_, TRUE);
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp47_ = _data3_->stack;
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp48_ = _data3_->spinner;
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add ((GtkContainer*) _tmp47_, (GtkWidget*) _tmp48_);
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp49_ = (GtkLabel*) gtk_label_new ("");
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp49_);
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->status_label = _tmp49_;
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp50_ = _data3_->status_label;
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp50_, TRUE);
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp51_ = _data3_->stack;
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp52_ = _data3_->status_label;
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add ((GtkContainer*) _tmp51_, (GtkWidget*) _tmp52_);
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp53_ = instructions;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp54_ = (GtkLabel*) gtk_label_new (_tmp53_);
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp54_);
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_->instructions_label = _tmp54_;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = _data3_->instructions_label;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp55_, TRUE);
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp56_ = _data3_->instructions_label;
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_xalign (_tmp56_, 0.f);
-#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp57_ = _data3_->instructions_label;
-#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_use_markup (_tmp57_, TRUE);
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp58_ = instructions_box;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = _data3_->instructions_label;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp58_, (GtkWidget*) _tmp59_, FALSE, FALSE, (guint) 0);
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = _ ("Once installed you will need to restart Simple Scan.");
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = (GtkLabel*) gtk_label_new (_tmp60_);
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp61_);
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (label);
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	label = _tmp61_;
-#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp62_ = label;
-#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp62_, TRUE);
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = label;
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_xalign (_tmp63_, 0.f);
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = dialog;
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = (GtkBox*) gtk_dialog_get_content_area (_tmp64_);
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _tmp65_, (guint) 12);
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = dialog;
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp67_ = (GtkBox*) gtk_dialog_get_content_area (_tmp66_);
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = label;
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, TRUE, TRUE, (guint) 0);
-#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = packages_to_install;
-#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69__length1 = packages_to_install_length1;
-#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp69__length1 > 0) {
-#line 7692 "ui.c"
-		GtkStack* _tmp70_ = NULL;
-		GtkSpinner* _tmp71_ = NULL;
-		GtkLabel* _tmp72_ = NULL;
-		const gchar* _tmp73_ = NULL;
-		gchar** _tmp74_ = NULL;
-		gint _tmp74__length1 = 0;
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp70_ = _data3_->stack;
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp71_ = _data3_->spinner;
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_object_set (_tmp71_, "active", TRUE, NULL);
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp72_ = _data3_->instructions_label;
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp73_ = _ ("Installing drivers...");
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_label_set_text (_tmp72_, _tmp73_);
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp74_ = packages_to_install;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp74__length1 = packages_to_install_length1;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_install_packages (self, _tmp74_, _tmp74__length1, ____lambda12__pk_progress_callback, self, ____lambda13__gasync_ready_callback, block3_data_ref (_data3_));
-#line 7719 "ui.c"
-	}
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp75_ = dialog;
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_run (_tmp75_);
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp76_ = dialog;
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp76_);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (instructions_box);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (label);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (dialog);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	packages_to_install = (_vala_array_free (packages_to_install, packages_to_install_length1, (GDestroyNotify) g_free), NULL);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (instructions);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (message);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	block3_data_unref (_data3_);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data3_ = NULL;
-#line 7745 "ui.c"
-}
-
-
-static void user_interface_install_packages_data_free (gpointer _data) {
-	UserInterfaceInstallPackagesData* _data_;
-	_data_ = _data;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->result);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->self);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_slice_free (UserInterfaceInstallPackagesData, _data_);
-#line 7758 "ui.c"
-}
-
-
-static void user_interface_install_packages (UserInterface* self, gchar** packages, int packages_length1, PkProgressCallback progress_callback, void* progress_callback_target, GAsyncReadyCallback _callback_, gpointer _user_data_) {
-	UserInterfaceInstallPackagesData* _data_;
-	UserInterface* _tmp0_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PkProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_ = g_slice_new0 (UserInterfaceInstallPackagesData);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, user_interface_install_packages);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, user_interface_install_packages_data_free);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = _g_object_ref0 (self);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->self = _tmp0_;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = packages;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1__length1 = packages_length1;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->packages = _tmp1_;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->packages_length1 = _tmp1__length1;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = progress_callback;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2__target = progress_callback_target;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->progress_callback = _tmp2_;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->progress_callback_target = _tmp2__target;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_install_packages_co (_data_);
-#line 7797 "ui.c"
-}
-
-
-static PkResults* user_interface_install_packages_finish (UserInterface* self, GAsyncResult* _res_, GError** error) {
-	PkResults* result;
-	UserInterfaceInstallPackagesData* _data_;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return NULL;
-#line 7808 "ui.c"
-	}
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _data_->result;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->result = NULL;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 7818 "ui.c"
-}
-
-
-static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
-	UserInterfaceInstallPackagesData* _data_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_ = _user_data_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_source_object_ = source_object;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_res_ = _res_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_install_packages_co (_data_);
-#line 7832 "ui.c"
-}
-
-
-static gint g_ptr_array_get_length (GPtrArray* self) {
-	gint result;
-	guint _tmp0_ = 0U;
-#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = self->len;
-#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = (gint) _tmp0_;
-#line 4858 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 7847 "ui.c"
-}
-
-
-static void g_ptr_array_set_length (GPtrArray* self, gint value) {
-	gint _tmp0_ = 0;
-#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_if_fail (self != NULL);
-#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = value;
-#line 4859 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_ptr_array_set_size (self, _tmp0_);
-#line 7859 "ui.c"
-}
-
-
-static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_) {
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (_data_->_state_) {
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case 0:
-#line 7868 "ui.c"
-		goto _state_0;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case 1:
-#line 7872 "ui.c"
-		goto _state_1;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case 2:
-#line 7876 "ui.c"
-		goto _state_2;
-		default:
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_assert_not_reached ();
-#line 7881 "ui.c"
-	}
-	_state_0:
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp0_ = NULL;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp0_ = pk_task_new ();
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->task = _data_->_tmp0_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp2_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp2_ = _data_->task;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp3_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp3__length1 = 0;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp3_ = _data_->packages;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp3__length1 = _data_->packages_length1;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp4_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp4__target = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp4_ = _data_->progress_callback;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp4__target = _data_->progress_callback_target;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_state_ = 1;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	pk_task_resolve_async (_data_->_tmp2_, (PkBitfield) PK_FILTER_ENUM_NOT_INSTALLED, _data_->_tmp3_, NULL, _data_->_tmp4_, _data_->_tmp4__target, user_interface_install_packages_ready, _data_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return FALSE;
-#line 7916 "ui.c"
-	_state_1:
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp5_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp5_ = pk_task_generic_finish (_data_->_tmp2_, _data_->_res_, &_data_->_inner_error_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp1_ = _data_->_tmp5_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_error_free (_data_->_inner_error_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->results);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->task);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_data_->_state_ == 0) {
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 7938 "ui.c"
-		} else {
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 7942 "ui.c"
-		}
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_object_unref (_data_->_async_result);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return FALSE;
-#line 7948 "ui.c"
-	}
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp6_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp6_ = _data_->_tmp1_;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp1_ = NULL;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->results);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->results = _data_->_tmp6_;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp8_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp8_ = _data_->results;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_data_->_tmp8_ == NULL) {
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp7_ = TRUE;
-#line 7968 "ui.c"
-	} else {
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp9_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp9_ = _data_->results;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp10_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp10_ = pk_results_get_error_code (_data_->_tmp9_);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp11_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp11_ = _data_->_tmp10_;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->_tmp7_ = _data_->_tmp11_ != NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->_tmp11_);
-#line 7986 "ui.c"
-	}
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_data_->_tmp7_) {
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->result = _data_->results;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->_tmp1_);
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->task);
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_data_->_state_ == 0) {
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8000 "ui.c"
-		} else {
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 8004 "ui.c"
-		}
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_object_unref (_data_->_async_result);
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return FALSE;
-#line 8010 "ui.c"
-	}
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp12_ = NULL;
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp12_ = _data_->results;
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp13_ = NULL;
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp13_ = pk_results_get_package_array (_data_->_tmp12_);
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_array = _data_->_tmp13_;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp14_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp14_ = _data_->package_array;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp15_ = 0;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp15_ = g_ptr_array_get_length (_data_->_tmp14_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp16_ = 0;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp16_ = _data_->_tmp15_;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp17_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp17_ = g_new0 (gchar*, (_data_->_tmp16_ + 1) + 1);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids_length1 = 0;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_package_ids_size_ = 0;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids = _data_->_tmp17_;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids_length1 = _data_->_tmp16_ + 1;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_package_ids_size_ = _data_->package_ids_length1;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18_ = NULL;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18__length1 = 0;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18_ = _data_->package_ids;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18__length1 = _data_->package_ids_length1;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp19_ = NULL;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp19_ = _data_->package_array;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp20_ = 0;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp20_ = g_ptr_array_get_length (_data_->_tmp19_);
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp21_ = 0;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp21_ = _data_->_tmp20_;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_data_->_tmp18_[_data_->_tmp21_]);
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp18_[_data_->_tmp21_] = NULL;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp22_ = NULL;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp22_ = _data_->_tmp18_[_data_->_tmp21_];
-#line 8076 "ui.c"
-	{
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->i = 0;
-#line 8080 "ui.c"
-		{
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_data_->_tmp23_ = TRUE;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			while (TRUE) {
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_data_->_tmp23_) {
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_data_->_tmp24_ = 0;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_data_->_tmp24_ = _data_->i;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_data_->i = _data_->_tmp24_ + 1;
-#line 8094 "ui.c"
-				}
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp23_ = FALSE;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp25_ = 0;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp25_ = _data_->i;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp26_ = NULL;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp26_ = _data_->package_array;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp27_ = 0;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp27_ = g_ptr_array_get_length (_data_->_tmp26_);
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp28_ = 0;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp28_ = _data_->_tmp27_;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!(_data_->_tmp25_ < _data_->_tmp28_)) {
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					break;
-#line 8118 "ui.c"
-				}
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29_ = NULL;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29__length1 = 0;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29_ = _data_->package_ids;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29__length1 = _data_->package_ids_length1;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp30_ = 0;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp30_ = _data_->i;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp31_ = NULL;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp31_ = _data_->package_array;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp32_ = NULL;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp32__length1 = 0;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp32_ = _data_->_tmp31_->pdata;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp32__length1 = (gint) _data_->_tmp31_->len;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp33_ = 0;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp33_ = _data_->i;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp34_ = NULL;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp34_ = _data_->_tmp32_[_data_->_tmp33_];
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp35_ = NULL;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp35_ = pk_package_get_id (_data_->_tmp34_);
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp36_ = NULL;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp36_ = g_strdup (_data_->_tmp35_);
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (_data_->_tmp29_[_data_->_tmp30_]);
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp29_[_data_->_tmp30_] = _data_->_tmp36_;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp37_ = NULL;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_data_->_tmp37_ = _data_->_tmp29_[_data_->_tmp30_];
-#line 8168 "ui.c"
-			}
-		}
-	}
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp39_ = NULL;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp39_ = _data_->task;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp40_ = NULL;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp40__length1 = 0;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp40_ = _data_->package_ids;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp40__length1 = _data_->package_ids_length1;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp41_ = NULL;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp41__target = NULL;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp41_ = _data_->progress_callback;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp41__target = _data_->progress_callback_target;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_state_ = 2;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	pk_task_install_packages_async (_data_->_tmp39_, _data_->_tmp40_, NULL, _data_->_tmp41_, _data_->_tmp41__target, user_interface_install_packages_ready, _data_);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return FALSE;
-#line 8198 "ui.c"
-	_state_2:
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp42_ = NULL;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp42_ = pk_task_generic_finish (_data_->_tmp39_, _data_->_res_, &_data_->_inner_error_);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp38_ = _data_->_tmp42_;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_error_free (_data_->_inner_error_);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_ptr_array_unref0 (_data_->package_array);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->_tmp1_);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->results);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data_->task);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_data_->_state_ == 0) {
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8226 "ui.c"
-		} else {
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_simple_async_result_complete (_data_->_async_result);
-#line 8230 "ui.c"
-		}
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_object_unref (_data_->_async_result);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return FALSE;
-#line 8236 "ui.c"
-	}
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp43_ = NULL;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp43_ = _data_->_tmp38_;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->_tmp38_ = NULL;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->result = _data_->_tmp43_;
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->_tmp38_);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_ptr_array_unref0 (_data_->package_array);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->_tmp1_);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->results);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->task);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_data_->_state_ == 0) {
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8262 "ui.c"
-	} else {
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 8266 "ui.c"
-	}
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_unref (_data_->_async_result);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return FALSE;
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->_tmp38_);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_ptr_array_unref0 (_data_->package_array);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->_tmp1_);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->results);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_data_->task);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_data_->_state_ == 0) {
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8288 "ui.c"
-	} else {
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_simple_async_result_complete (_data_->_async_result);
-#line 8292 "ui.c"
-	}
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_unref (_data_->_async_result);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return FALSE;
-#line 8298 "ui.c"
-}
-
-
-static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEventWindowState* event) {
-	UserInterface * self;
-	gboolean result = FALSE;
-	gboolean _result_ = FALSE;
-	GdkEventWindowState* _tmp2_ = NULL;
-	GdkWindowState _tmp3_ = 0;
-	GdkEventWindowState* _tmp6_ = NULL;
-	GdkWindowState _tmp7_ = 0;
-#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (UserInterface*) base;
-#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_result_ = GDK_EVENT_PROPAGATE;
-#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (GTK_WIDGET_CLASS (user_interface_parent_class)->window_state_event != NULL) {
-#line 8318 "ui.c"
-		GdkEventWindowState* _tmp0_ = NULL;
-		gboolean _tmp1_ = FALSE;
-#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = event;
-#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = GTK_WIDGET_CLASS (user_interface_parent_class)->window_state_event ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), _tmp0_);
-#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_result_ = _tmp1_;
-#line 8327 "ui.c"
-	}
-#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = event;
-#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_->changed_mask;
-#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if ((_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-#line 8335 "ui.c"
-		GdkEventWindowState* _tmp4_ = NULL;
-		GdkWindowState _tmp5_ = 0;
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = event;
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _tmp4_->new_window_state;
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_is_maximized = (_tmp5_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_save_state (self, FALSE);
-#line 8346 "ui.c"
-	}
-#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = event;
-#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = _tmp6_->changed_mask;
-#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if ((_tmp7_ & GDK_WINDOW_STATE_FULLSCREEN) != 0) {
-#line 8354 "ui.c"
-		GdkEventWindowState* _tmp8_ = NULL;
-		GdkWindowState _tmp9_ = 0;
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = event;
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = _tmp8_->new_window_state;
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_is_fullscreen = (_tmp9_ & GDK_WINDOW_STATE_FULLSCREEN) != 0;
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_save_state (self, FALSE);
-#line 8365 "ui.c"
-	}
-#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _result_;
-#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 8371 "ui.c"
-}
-
-
-static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = user_interface_on_quit (self);
-#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = !_tmp0_;
-#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 8390 "ui.c"
-}
-
-
-static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
-	gboolean result;
-	result = user_interface_window_delete_event_cb ((UserInterface*) self, _sender, event);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 8399 "ui.c"
-}
-
-
-static void user_interface_page_size_changed_cb (UserInterface* self, Page* page) {
-	Page* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	Page* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	Page* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (page != NULL);
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = page;
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = page_get_width (_tmp0_);
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_width = _tmp2_;
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page;
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page_get_height (_tmp3_);
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _tmp4_;
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_height = _tmp5_;
-#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = page;
-#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = page_get_dpi (_tmp6_);
-#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = _tmp7_;
-#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_dpi = _tmp8_;
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_state (self, FALSE);
-#line 8443 "ui.c"
-}
-
-
-static void user_interface_page_scan_direction_changed_cb (UserInterface* self, Page* page) {
-	Page* _tmp0_ = NULL;
-	ScanDirection _tmp1_ = 0;
-	ScanDirection _tmp2_ = 0;
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (page != NULL);
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = page;
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_scan_direction = _tmp2_;
-#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_state (self, FALSE);
-#line 8465 "ui.c"
-}
-
-
-static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_size_changed_cb ((UserInterface*) self, _sender);
-#line 8472 "ui.c"
-}
-
-
-static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_scan_direction_changed_cb ((UserInterface*) self, _sender);
-#line 8479 "ui.c"
-}
-
-
-static void user_interface_page_added_cb (UserInterface* self, Book* book, Page* page) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	ScanDirection _tmp2_ = 0;
-	ScanDirection _tmp3_ = 0;
-	Page* _tmp4_ = NULL;
-	Page* _tmp5_ = NULL;
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (book != NULL);
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (page != NULL);
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = page;
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_size_changed_cb (self, _tmp0_);
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = page;
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = page_get_scan_direction (_tmp1_);
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_scan_direction = _tmp3_;
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page;
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp4_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self, 0);
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page;
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp5_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self, 0);
-#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_update_page_menu (self);
-#line 8518 "ui.c"
-}
-
-
-static void user_interface_reordered_cb (UserInterface* self, Book* book) {
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (book != NULL);
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_update_page_menu (self);
-#line 8529 "ui.c"
-}
-
-
-static void user_interface_page_removed_cb (UserInterface* self, Book* book, Page* page) {
-	Page* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	Page* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	Book* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	guint _tmp6_ = 0U;
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (book != NULL);
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (page != NULL);
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = page;
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 1761 "/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 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = page;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 1762 "/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 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = book;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = book_get_n_pages (_tmp4_);
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = _tmp5_;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp6_ == ((guint) 0)) {
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_add_default_page (self);
-#line 8569 "ui.c"
-	}
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_update_page_menu (self);
-#line 8573 "ui.c"
-}
-
-
-static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* combo, gint default_dpi, gint current_dpi) {
-	GtkCellRendererText* renderer = NULL;
-	GtkCellRendererText* _tmp0_ = NULL;
-	GtkComboBox* _tmp1_ = NULL;
-	GtkCellRendererText* _tmp2_ = NULL;
-	GtkComboBox* _tmp3_ = NULL;
-	GtkCellRendererText* _tmp4_ = NULL;
-	GtkListStore* model = NULL;
-	GtkComboBox* _tmp5_ = NULL;
-	GtkTreeModel* _tmp6_ = NULL;
-	GtkTreeModel* _tmp7_ = NULL;
-	GtkListStore* _tmp8_ = NULL;
-	gint* scan_resolutions = NULL;
-	gint* _tmp9_ = NULL;
-	gint scan_resolutions_length1 = 0;
-	gint _scan_resolutions_size_ = 0;
-	gint* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (combo != NULL);
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp0_);
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp0_;
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = combo;
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = renderer;
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = combo;
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = renderer;
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = combo;
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = _tmp6_;
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_list_store_get_type ()) ? ((GtkListStore*) _tmp7_) : NULL);
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	model = _tmp8_;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = g_new0 (gint, 6);
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_[0] = 75;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_[1] = 150;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_[2] = 300;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_[3] = 600;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_[4] = 1200;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_[5] = 2400;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	scan_resolutions = _tmp9_;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	scan_resolutions_length1 = 6;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_scan_resolutions_size_ = scan_resolutions_length1;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = scan_resolutions;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10__length1 = scan_resolutions_length1;
-#line 8651 "ui.c"
-	{
-		gint* dpi_collection = NULL;
-		gint dpi_collection_length1 = 0;
-		gint _dpi_collection_size_ = 0;
-		gint dpi_it = 0;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi_collection = _tmp10_;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi_collection_length1 = _tmp10__length1;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		for (dpi_it = 0; dpi_it < _tmp10__length1; dpi_it = dpi_it + 1) {
-#line 8663 "ui.c"
-			gint dpi = 0;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			dpi = dpi_collection[dpi_it];
-#line 8667 "ui.c"
-			{
-				gchar* label = NULL;
-				gint _tmp11_ = 0;
-				gint _tmp12_ = 0;
-				GtkTreeIter iter = {0};
-				GtkListStore* _tmp27_ = NULL;
-				GtkTreeIter _tmp28_ = {0};
-				GtkListStore* _tmp29_ = NULL;
-				GtkTreeIter _tmp30_ = {0};
-				gint _tmp31_ = 0;
-				const gchar* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gint _tmp34_ = 0;
-#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp11_ = dpi;
-#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp12_ = default_dpi;
-#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp11_ == _tmp12_) {
-#line 8687 "ui.c"
-					const gchar* _tmp13_ = NULL;
-					gint _tmp14_ = 0;
-					gchar* _tmp15_ = NULL;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp13_ = _ ("%d dpi (default)");
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp14_ = dpi;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp15_ = g_strdup_printf (_tmp13_, _tmp14_);
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_g_free0 (label);
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					label = _tmp15_;
-#line 8701 "ui.c"
-				} else {
-					gint _tmp16_ = 0;
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp16_ = dpi;
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (_tmp16_ == 75) {
-#line 8708 "ui.c"
-						const gchar* _tmp17_ = NULL;
-						gint _tmp18_ = 0;
-						gchar* _tmp19_ = NULL;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp17_ = _ ("%d dpi (draft)");
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp18_ = dpi;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_g_free0 (label);
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						label = _tmp19_;
-#line 8722 "ui.c"
-					} else {
-						gint _tmp20_ = 0;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp20_ = dpi;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						if (_tmp20_ == 1200) {
-#line 8729 "ui.c"
-							const gchar* _tmp21_ = NULL;
-							gint _tmp22_ = 0;
-							gchar* _tmp23_ = NULL;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp21_ = _ ("%d dpi (high resolution)");
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp22_ = dpi;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp23_ = g_strdup_printf (_tmp21_, _tmp22_);
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_g_free0 (label);
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							label = _tmp23_;
-#line 8743 "ui.c"
-						} else {
-							const gchar* _tmp24_ = NULL;
-							gint _tmp25_ = 0;
-							gchar* _tmp26_ = NULL;
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp24_ = _ ("%d dpi");
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp25_ = dpi;
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp26_ = g_strdup_printf (_tmp24_, _tmp25_);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_g_free0 (label);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							label = _tmp26_;
-#line 8758 "ui.c"
-						}
-					}
-				}
-#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp27_ = model;
-#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_list_store_append (_tmp27_, &_tmp28_);
-#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				iter = _tmp28_;
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp29_ = model;
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp30_ = iter;
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp31_ = dpi;
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp32_ = label;
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_list_store_set (_tmp29_, &_tmp30_, 0, _tmp31_, 1, _tmp32_, -1, -1);
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp33_ = dpi;
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp34_ = current_dpi;
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp33_ == _tmp34_) {
-#line 8784 "ui.c"
-					GtkComboBox* _tmp35_ = NULL;
-					GtkTreeIter _tmp36_ = {0};
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp35_ = combo;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp36_ = iter;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_);
-#line 8793 "ui.c"
-				}
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (label);
-#line 8797 "ui.c"
-			}
-		}
-	}
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	scan_resolutions = (g_free (scan_resolutions), NULL);
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (model);
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (renderer);
-#line 8807 "ui.c"
-}
-
-
-static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
-	GtkMenuItem* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	GtkButton* _tmp4_ = NULL;
-	Book* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	GtkToolButton* _tmp8_ = NULL;
-	Book* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
-	Book* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
-	GtkMenuItem* _tmp16_ = NULL;
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (book != NULL);
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->save_menuitem;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = book_get_needs_saving (_tmp1_);
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp3_);
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->save_button;
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = book;
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = book_get_needs_saving (_tmp5_);
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = _tmp6_;
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_);
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = self->priv->save_toolbutton;
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = book;
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = book_get_needs_saving (_tmp9_);
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = _tmp10_;
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp11_);
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = book;
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = book_get_needs_saving (_tmp12_);
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = _tmp13_;
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp14_) {
-#line 8870 "ui.c"
-		GtkMenuItem* _tmp15_ = NULL;
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = self->priv->save_as_menuitem;
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, TRUE);
-#line 8876 "ui.c"
-	}
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = self->priv->copy_to_clipboard_menuitem;
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE);
-#line 8882 "ui.c"
-}
-
-
-static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_info_bar_response_cb ((UserInterface*) self, _sender, response_id);
-#line 8889 "ui.c"
-}
-
-
-static void __lambda14_ (UserInterface* self) {
-	GSettings* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->settings;
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_text_dpi (self);
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp0_, "text-dpi", _tmp1_);
-#line 8902 "ui.c"
-}
-
-
-static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda14_ ((UserInterface*) self);
-#line 8909 "ui.c"
-}
-
-
-static void __lambda15_ (UserInterface* self) {
-	GSettings* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->settings;
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_photo_dpi (self);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_);
-#line 8922 "ui.c"
-}
-
-
-static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda15_ ((UserInterface*) self);
-#line 8929 "ui.c"
-}
-
-
-static void __lambda16_ (UserInterface* self) {
-	GSettings* _tmp0_ = NULL;
-	ScanType _tmp1_ = 0;
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->settings;
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_page_side (self);
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_);
-#line 8942 "ui.c"
-}
-
-
-static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda16_ ((UserInterface*) self);
-#line 8949 "ui.c"
-}
-
-
-static void __lambda17_ (UserInterface* self) {
-	gint w = 0;
-	gint h = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	GSettings* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_get_paper_size (self, &_tmp0_, &_tmp1_);
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	w = _tmp0_;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	h = _tmp1_;
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->settings;
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp2_, "paper-width", w);
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->settings;
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp3_, "paper-height", h);
-#line 8974 "ui.c"
-}
-
-
-static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda17_ ((UserInterface*) self);
-#line 8981 "ui.c"
-}
-
-
-static void __lambda18_ (UserInterface* self) {
-	GSettings* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->settings;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_brightness (self);
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
-#line 8997 "ui.c"
-}
-
-
-static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda18_ ((UserInterface*) self);
-#line 9004 "ui.c"
-}
-
-
-static void __lambda19_ (UserInterface* self) {
-	GSettings* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->settings;
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_contrast (self);
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
-#line 9020 "ui.c"
-}
-
-
-static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda19_ ((UserInterface*) self);
-#line 9027 "ui.c"
-}
-
-
-static void __lambda20_ (UserInterface* self) {
-	GSettings* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->settings;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_quality (self);
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
-#line 9043 "ui.c"
-}
-
-
-static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda20_ ((UserInterface*) self);
-#line 9050 "ui.c"
-}
-
-
-static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
-#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_selected_cb ((UserInterface*) self, _sender, page);
-#line 9057 "ui.c"
-}
-
-
-static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
-#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_show_page_cb ((UserInterface*) self, _sender, page);
-#line 9064 "ui.c"
-}
-
-
-static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
-#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_show_page_menu_cb ((UserInterface*) self, _sender);
-#line 9071 "ui.c"
-}
-
-
-static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_book_saving_cb ((UserInterface*) self, i);
-#line 9078 "ui.c"
-}
-
-
-static void user_interface_load (UserInterface* self) {
-	GtkIconTheme* _tmp0_ = NULL;
-	GtkApplication* app = NULL;
-	GApplication* _tmp1_ = NULL;
-	GtkApplication* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	GtkApplication* _tmp53_ = NULL;
-	GtkInfoBar* _tmp54_ = NULL;
-	GtkInfoBar* _tmp55_ = NULL;
-	GtkBox* _tmp56_ = NULL;
-	GtkInfoBar* _tmp57_ = NULL;
-	GtkBox* hbox = NULL;
-	GtkBox* _tmp58_ = NULL;
-	GtkContainer* content_area = NULL;
-	GtkInfoBar* _tmp59_ = NULL;
-	GtkContainer* _tmp60_ = NULL;
-	GtkContainer* _tmp61_ = NULL;
-	GtkContainer* _tmp62_ = NULL;
-	GtkBox* _tmp63_ = NULL;
-	GtkBox* _tmp64_ = NULL;
-	GtkImage* _tmp65_ = NULL;
-	GtkBox* _tmp66_ = NULL;
-	GtkImage* _tmp67_ = NULL;
-	GtkImage* _tmp68_ = NULL;
-	GtkLabel* _tmp69_ = NULL;
-	GtkLabel* _tmp70_ = NULL;
-	GtkBox* _tmp71_ = NULL;
-	GtkLabel* _tmp72_ = NULL;
-	GtkLabel* _tmp73_ = NULL;
-	GtkInfoBar* _tmp74_ = NULL;
-	const gchar* _tmp75_ = NULL;
-	GtkButton* _tmp76_ = NULL;
-	GtkButton* _tmp77_ = NULL;
-	GtkInfoBar* _tmp78_ = NULL;
-	const gchar* _tmp79_ = NULL;
-	GtkButton* _tmp80_ = NULL;
-	GtkButton* _tmp81_ = NULL;
-	GtkInfoBar* _tmp82_ = NULL;
-	const gchar* _tmp83_ = NULL;
-	GtkButton* _tmp84_ = NULL;
-	GtkButton* _tmp85_ = NULL;
-	GtkTreeIter iter = {0};
-	GtkListStore* _tmp86_ = NULL;
-	GtkTreeIter _tmp87_ = {0};
-	GtkListStore* _tmp88_ = NULL;
-	GtkTreeIter _tmp89_ = {0};
-	const gchar* _tmp90_ = NULL;
-	GtkListStore* _tmp91_ = NULL;
-	GtkTreeIter _tmp92_ = {0};
-	GtkListStore* _tmp93_ = NULL;
-	GtkTreeIter _tmp94_ = {0};
-	GtkListStore* _tmp95_ = NULL;
-	GtkTreeIter _tmp96_ = {0};
-	GtkListStore* _tmp97_ = NULL;
-	GtkTreeIter _tmp98_ = {0};
-	GtkListStore* _tmp99_ = NULL;
-	GtkTreeIter _tmp100_ = {0};
-	GtkListStore* _tmp101_ = NULL;
-	GtkTreeIter _tmp102_ = {0};
-	GtkListStore* _tmp103_ = NULL;
-	GtkTreeIter _tmp104_ = {0};
-	GtkListStore* _tmp105_ = NULL;
-	GtkTreeIter _tmp106_ = {0};
-	GtkListStore* _tmp107_ = NULL;
-	GtkTreeIter _tmp108_ = {0};
-	GtkListStore* _tmp109_ = NULL;
-	GtkTreeIter _tmp110_ = {0};
-	GtkListStore* _tmp111_ = NULL;
-	GtkTreeIter _tmp112_ = {0};
-	GtkListStore* _tmp113_ = NULL;
-	GtkTreeIter _tmp114_ = {0};
-	gint dpi = 0;
-	GSettings* _tmp115_ = NULL;
-	gint _tmp116_ = 0;
-	gint _tmp117_ = 0;
-	GtkComboBox* _tmp118_ = NULL;
-	gint _tmp119_ = 0;
-	GtkComboBox* _tmp120_ = NULL;
-	GSettings* _tmp121_ = NULL;
-	gint _tmp122_ = 0;
-	gint _tmp123_ = 0;
-	GtkComboBox* _tmp124_ = NULL;
-	gint _tmp125_ = 0;
-	GtkComboBox* _tmp126_ = NULL;
-	GtkCellRendererText* renderer = NULL;
-	GtkCellRendererText* _tmp127_ = NULL;
-	GtkComboBox* _tmp128_ = NULL;
-	GtkCellRendererText* _tmp129_ = NULL;
-	GtkComboBox* _tmp130_ = NULL;
-	GtkCellRendererText* _tmp131_ = NULL;
-	GtkCellRendererText* _tmp132_ = NULL;
-	GtkComboBox* _tmp133_ = NULL;
-	GtkCellRendererText* _tmp134_ = NULL;
-	GtkComboBox* _tmp135_ = NULL;
-	GtkCellRendererText* _tmp136_ = NULL;
-	GSettings* _tmp137_ = NULL;
-	gint _tmp138_ = 0;
-	GtkComboBox* _tmp139_ = NULL;
-	GtkCellRendererText* _tmp140_ = NULL;
-	GtkComboBox* _tmp141_ = NULL;
-	GtkCellRendererText* _tmp142_ = NULL;
-	GtkComboBox* _tmp143_ = NULL;
-	GtkCellRendererText* _tmp144_ = NULL;
-	gint paper_width = 0;
-	GSettings* _tmp145_ = NULL;
-	gint _tmp146_ = 0;
-	gint paper_height = 0;
-	GSettings* _tmp147_ = NULL;
-	gint _tmp148_ = 0;
-	gint _tmp149_ = 0;
-	gint _tmp150_ = 0;
-	GtkComboBox* _tmp151_ = NULL;
-	gdouble lower = 0.0;
-	GtkAdjustment* _tmp152_ = NULL;
-	gdouble _tmp153_ = 0.0;
-	gdouble _tmp154_ = 0.0;
-	gchar* darker_label = NULL;
-	const gchar* _tmp155_ = NULL;
-	gchar* _tmp156_ = NULL;
-	gdouble upper = 0.0;
-	GtkAdjustment* _tmp157_ = NULL;
-	gdouble _tmp158_ = 0.0;
-	gdouble _tmp159_ = 0.0;
-	gchar* lighter_label = NULL;
-	const gchar* _tmp160_ = NULL;
-	gchar* _tmp161_ = NULL;
-	GtkScale* _tmp162_ = NULL;
-	gdouble _tmp163_ = 0.0;
-	const gchar* _tmp164_ = NULL;
-	GtkScale* _tmp165_ = NULL;
-	GtkScale* _tmp166_ = NULL;
-	gdouble _tmp167_ = 0.0;
-	const gchar* _tmp168_ = NULL;
-	GSettings* _tmp169_ = NULL;
-	gint _tmp170_ = 0;
-	GtkAdjustment* _tmp171_ = NULL;
-	GtkAdjustment* _tmp172_ = NULL;
-	gdouble _tmp173_ = 0.0;
-	gdouble _tmp174_ = 0.0;
-	gchar* less_label = NULL;
-	const gchar* _tmp175_ = NULL;
-	gchar* _tmp176_ = NULL;
-	GtkAdjustment* _tmp177_ = NULL;
-	gdouble _tmp178_ = 0.0;
-	gdouble _tmp179_ = 0.0;
-	gchar* more_label = NULL;
-	const gchar* _tmp180_ = NULL;
-	gchar* _tmp181_ = NULL;
-	GtkScale* _tmp182_ = NULL;
-	gdouble _tmp183_ = 0.0;
-	const gchar* _tmp184_ = NULL;
-	GtkScale* _tmp185_ = NULL;
-	GtkScale* _tmp186_ = NULL;
-	gdouble _tmp187_ = 0.0;
-	const gchar* _tmp188_ = NULL;
-	GSettings* _tmp189_ = NULL;
-	gint _tmp190_ = 0;
-	GtkAdjustment* _tmp191_ = NULL;
-	GtkAdjustment* _tmp192_ = NULL;
-	gdouble _tmp193_ = 0.0;
-	gdouble _tmp194_ = 0.0;
-	gchar* minimum_label = NULL;
-	const gchar* _tmp195_ = NULL;
-	gchar* _tmp196_ = NULL;
-	GtkAdjustment* _tmp197_ = NULL;
-	gdouble _tmp198_ = 0.0;
-	gdouble _tmp199_ = 0.0;
-	gchar* maximum_label = NULL;
-	const gchar* _tmp200_ = NULL;
-	gchar* _tmp201_ = NULL;
-	GtkScale* _tmp202_ = NULL;
-	gdouble _tmp203_ = 0.0;
-	const gchar* _tmp204_ = NULL;
-	GtkScale* _tmp205_ = NULL;
-	GtkScale* _tmp206_ = NULL;
-	gdouble _tmp207_ = 0.0;
-	const gchar* _tmp208_ = NULL;
-	GSettings* _tmp209_ = NULL;
-	gint _tmp210_ = 0;
-	GtkAdjustment* _tmp211_ = NULL;
-	gchar* document_type = NULL;
-	GSettings* _tmp212_ = NULL;
-	gchar* _tmp213_ = NULL;
-	const gchar* _tmp214_ = NULL;
-	Book* _tmp216_ = NULL;
-	BookView* _tmp217_ = NULL;
-	BookView* _tmp218_ = NULL;
-	GtkBox* _tmp219_ = NULL;
-	BookView* _tmp220_ = NULL;
-	BookView* _tmp221_ = NULL;
-	BookView* _tmp222_ = NULL;
-	BookView* _tmp223_ = NULL;
-	BookView* _tmp224_ = NULL;
-	GtkDialog* _tmp225_ = NULL;
-	GtkDialog* _tmp226_ = NULL;
-	gint _tmp227_ = 0;
-	gint _tmp228_ = 0;
-	gint _tmp229_ = 0;
-	gint _tmp230_ = 0;
-	gboolean _tmp231_ = FALSE;
-	gboolean _tmp232_ = FALSE;
-	const gchar* _tmp233_ = NULL;
-	ProgressBarDialog* _tmp234_ = NULL;
-	Book* _tmp235_ = NULL;
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = gtk_icon_theme_get_default ();
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_default_icon_name ("scanner");
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_application_get_default ();
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_application_get_type ()) ? ((GtkApplication*) _tmp1_) : NULL);
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	app = _tmp2_;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = user_interface_is_traditional_desktop (self);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_) {
-#line 9304 "ui.c"
-		GtkMenuBar* _tmp4_ = NULL;
-		GtkToolbar* _tmp5_ = NULL;
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_window_set_titlebar ((GtkWindow*) self, NULL);
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->menubar;
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp4_, TRUE);
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = self->priv->toolbar;
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp5_, TRUE);
-#line 9317 "ui.c"
-	} else {
-		GtkApplication* _tmp6_ = NULL;
-		GMenu* appmenu = NULL;
-		GMenu* _tmp7_ = NULL;
-		GMenu* section = NULL;
-		GMenu* _tmp8_ = NULL;
-		GMenu* _tmp9_ = NULL;
-		GMenu* _tmp10_ = NULL;
-		GMenu* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		GMenu* _tmp13_ = NULL;
-		GMenu* _tmp14_ = NULL;
-		GMenu* _tmp15_ = NULL;
-		GMenu* menu = NULL;
-		GMenu* _tmp16_ = NULL;
-		GMenu* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-		GMenu* _tmp19_ = NULL;
-		GMenu* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GMenu* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
-		GMenu* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		GMenu* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-		GMenu* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		GMenu* _tmp30_ = NULL;
-		GMenu* _tmp31_ = NULL;
-		GMenu* _tmp32_ = NULL;
-		GMenu* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
-		GMenu* _tmp35_ = NULL;
-		GMenu* _tmp36_ = NULL;
-		GMenu* _tmp37_ = NULL;
-		GMenu* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
-		GMenu* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
-		GMenu* _tmp42_ = NULL;
-		const gchar* _tmp43_ = NULL;
-		GtkApplication* _tmp44_ = NULL;
-		GMenu* _tmp45_ = NULL;
-		GtkApplication* _tmp46_ = NULL;
-		GtkApplication* _tmp47_ = NULL;
-		GtkApplication* _tmp48_ = NULL;
-		GtkApplication* _tmp49_ = NULL;
-		GtkApplication* _tmp50_ = NULL;
-		GtkApplication* _tmp51_ = NULL;
-		GtkApplication* _tmp52_ = NULL;
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = app;
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_action_map_add_action_entries ((GActionMap*) _tmp6_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = g_menu_new ();
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		appmenu = _tmp7_;
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = g_menu_new ();
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		section = _tmp8_;
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = appmenu;
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = section;
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp9_, NULL, (GMenuModel*) _tmp10_);
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = section;
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = _ ("New Document");
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp11_, _tmp12_, "app.new_document");
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = g_menu_new ();
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (section);
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		section = _tmp13_;
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = appmenu;
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = section;
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp14_, NULL, (GMenuModel*) _tmp15_);
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = g_menu_new ();
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		menu = _tmp16_;
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = section;
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp18_ = _ ("Document");
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp19_ = menu;
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_submenu (_tmp17_, _tmp18_, (GMenuModel*) _tmp19_);
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp20_ = menu;
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp21_ = _ ("Reorder Pages");
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp20_, _tmp21_, "app.reorder");
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp22_ = menu;
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp23_ = _ ("Save");
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp22_, _tmp23_, "app.save");
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp24_ = menu;
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp25_ = _ ("Save As...");
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp24_, _tmp25_, "app.save_as");
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp26_ = menu;
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp27_ = _ ("Email...");
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp26_, _tmp27_, "app.email");
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp28_ = menu;
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp29_ = _ ("Print...");
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp28_, _tmp29_, "app.print");
-#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp30_ = g_menu_new ();
-#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (section);
-#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		section = _tmp30_;
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp31_ = appmenu;
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp32_ = section;
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp31_, NULL, (GMenuModel*) _tmp32_);
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp33_ = section;
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp34_ = _ ("Preferences");
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp33_, _tmp34_, "app.preferences");
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp35_ = g_menu_new ();
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (section);
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		section = _tmp35_;
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp36_ = appmenu;
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp37_ = section;
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp36_, NULL, (GMenuModel*) _tmp37_);
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp38_ = section;
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp39_ = _ ("Help");
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp38_, _tmp39_, "app.help");
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp40_ = section;
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp41_ = _ ("About");
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp40_, _tmp41_, "app.about");
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp42_ = section;
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp43_ = _ ("Quit");
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp42_, _tmp43_, "app.quit");
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp44_ = app;
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp45_ = appmenu;
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_set_app_menu (_tmp44_, (GMenuModel*) _tmp45_);
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp46_ = app;
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp46_, "<Ctrl>N", "app.new_document", NULL);
-#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp47_ = app;
-#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp47_, "<Ctrl>S", "app.save", NULL);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp48_ = app;
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp48_, "<Shift><Ctrl>S", "app.save_as", NULL);
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp49_ = app;
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp49_, "<Ctrl>E", "app.email", NULL);
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp50_ = app;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp50_, "<Ctrl>P", "app.print", NULL);
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp51_ = app;
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp51_, "F1", "app.help", NULL);
-#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp52_ = app;
-#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp52_, "<Ctrl>Q", "app.quit", NULL);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (menu);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (section);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (appmenu);
-#line 9535 "ui.c"
-	}
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp53_ = app;
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_application_add_window (_tmp53_, (GtkWindow*) self);
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp54_ = (GtkInfoBar*) gtk_info_bar_new ();
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp54_);
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar);
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar = _tmp54_;
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = self->priv->info_bar;
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp55_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self, 0);
-#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp56_ = self->priv->main_vbox;
-#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp57_ = self->priv->info_bar;
-#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp56_, (GtkWidget*) _tmp57_, FALSE, TRUE, (guint) 0);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp58_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp58_);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	hbox = _tmp58_;
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = self->priv->info_bar;
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = gtk_info_bar_get_content_area (_tmp59_);
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp60_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp60_) : NULL);
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	content_area = _tmp61_;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp62_ = content_area;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = hbox;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add (_tmp62_, (GtkWidget*) _tmp63_);
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = hbox;
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp64_, TRUE);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp65_);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_image);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_image = _tmp65_;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = hbox;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp67_ = self->priv->info_bar_image;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp66_, (GtkWidget*) _tmp67_, FALSE, TRUE, (guint) 0);
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = self->priv->info_bar_image;
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp68_, TRUE);
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp69_);
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_label);
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_label = _tmp69_;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp70_ = self->priv->info_bar_label;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_misc_set_alignment ((GtkMisc*) _tmp70_, 0.0f, 0.5f);
-#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp71_ = hbox;
-#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp72_ = self->priv->info_bar_label;
-#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp71_, (GtkWidget*) _tmp72_, TRUE, TRUE, (guint) 0);
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp73_ = self->priv->info_bar_label;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp73_, TRUE);
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp74_ = self->priv->info_bar;
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp75_ = _ ("_Close");
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp76_ = gtk_info_bar_add_button (_tmp74_, _tmp75_, (gint) GTK_RESPONSE_CLOSE);
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp76_, gtk_button_get_type ()) ? ((GtkButton*) _tmp76_) : NULL);
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_close_button = _tmp77_;
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp78_ = self->priv->info_bar;
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp79_ = _ ("Change _Scanner");
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp80_ = gtk_info_bar_add_button (_tmp78_, _tmp79_, 1);
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, gtk_button_get_type ()) ? ((GtkButton*) _tmp80_) : NULL);
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_change_scanner_button = _tmp81_;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp82_ = self->priv->info_bar;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp83_ = _ ("_Install Drivers");
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp84_ = gtk_info_bar_add_button (_tmp82_, _tmp83_, 2);
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp85_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp84_, gtk_button_get_type ()) ? ((GtkButton*) _tmp84_) : NULL);
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_install_button);
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_install_button = _tmp85_;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp86_ = self->priv->paper_size_model;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp86_, &_tmp87_);
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp87_;
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp88_ = self->priv->paper_size_model;
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp89_ = iter;
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp90_ = _ ("Automatic");
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp88_, &_tmp89_, 0, 0, 1, 0, 2, _tmp90_, -1, -1);
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp91_ = self->priv->paper_size_model;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp91_, &_tmp92_);
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp92_;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp93_ = self->priv->paper_size_model;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp94_ = iter;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp93_, &_tmp94_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp95_ = self->priv->paper_size_model;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp95_, &_tmp96_);
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp96_;
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp97_ = self->priv->paper_size_model;
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp98_ = iter;
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp97_, &_tmp98_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp99_ = self->priv->paper_size_model;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp99_, &_tmp100_);
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp100_;
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp101_ = self->priv->paper_size_model;
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp102_ = iter;
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp101_, &_tmp102_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp103_ = self->priv->paper_size_model;
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp103_, &_tmp104_);
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp104_;
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp105_ = self->priv->paper_size_model;
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp106_ = iter;
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp105_, &_tmp106_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp107_ = self->priv->paper_size_model;
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp107_, &_tmp108_);
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp108_;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp109_ = self->priv->paper_size_model;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp110_ = iter;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp109_, &_tmp110_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp111_ = self->priv->paper_size_model;
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp111_, &_tmp112_);
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp112_;
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp113_ = self->priv->paper_size_model;
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp114_ = iter;
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp113_, &_tmp114_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp115_ = self->priv->settings;
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp116_ = g_settings_get_int (_tmp115_, "text-dpi");
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp116_;
-#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp117_ = dpi;
-#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp117_ <= 0) {
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 9757 "ui.c"
-	}
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp118_ = self->priv->text_dpi_combo;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp119_ = dpi;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp118_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp119_);
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp120_ = self->priv->text_dpi_combo;
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp120_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp121_ = self->priv->settings;
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp122_ = g_settings_get_int (_tmp121_, "photo-dpi");
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp122_;
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp123_ = dpi;
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp123_ <= 0) {
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 9781 "ui.c"
-	}
-#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp124_ = self->priv->photo_dpi_combo;
-#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp125_ = dpi;
-#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp124_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp125_);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp126_ = self->priv->photo_dpi_combo;
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp126_, "changed", (GCallback) ___lambda15__gtk_combo_box_changed, self, 0);
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp127_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp127_);
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp127_;
-#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp128_ = self->priv->device_combo;
-#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp129_ = renderer;
-#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp128_, (GtkCellRenderer*) _tmp129_, TRUE);
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp130_ = self->priv->device_combo;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp131_ = renderer;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp130_, (GtkCellRenderer*) _tmp131_, "text", 1);
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp132_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp132_);
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (renderer);
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp132_;
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp133_ = self->priv->page_side_combo;
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp134_ = renderer;
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp133_, (GtkCellRenderer*) _tmp134_, TRUE);
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp135_ = self->priv->page_side_combo;
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp136_ = renderer;
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp135_, (GtkCellRenderer*) _tmp136_, "text", 1);
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp137_ = self->priv->settings;
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp138_ = g_settings_get_enum (_tmp137_, "page-side");
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_page_side (self, (ScanType) _tmp138_);
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp139_ = self->priv->page_side_combo;
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp139_, "changed", (GCallback) ___lambda16__gtk_combo_box_changed, self, 0);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp140_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp140_);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (renderer);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp140_;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp141_ = self->priv->paper_size_combo;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp142_ = renderer;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp141_, (GtkCellRenderer*) _tmp142_, TRUE);
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp143_ = self->priv->paper_size_combo;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp144_ = renderer;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp143_, (GtkCellRenderer*) _tmp144_, "text", 2);
-#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp145_ = self->priv->settings;
-#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp146_ = g_settings_get_int (_tmp145_, "paper-width");
-#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_width = _tmp146_;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp147_ = self->priv->settings;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp148_ = g_settings_get_int (_tmp147_, "paper-height");
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_height = _tmp148_;
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp149_ = paper_width;
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp150_ = paper_height;
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_paper_size (self, _tmp149_, _tmp150_);
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp151_ = self->priv->paper_size_combo;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp151_, "changed", (GCallback) ___lambda17__gtk_combo_box_changed, self, 0);
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp152_ = self->priv->brightness_adjustment;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp153_ = gtk_adjustment_get_lower (_tmp152_);
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp154_ = _tmp153_;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp154_;
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp155_ = _ ("Darker");
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp156_ = g_strdup_printf ("<small>%s</small>", _tmp155_);
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	darker_label = _tmp156_;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp157_ = self->priv->brightness_adjustment;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp158_ = gtk_adjustment_get_upper (_tmp157_);
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp159_ = _tmp158_;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp159_;
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp160_ = _ ("Lighter");
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp161_ = g_strdup_printf ("<small>%s</small>", _tmp160_);
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lighter_label = _tmp161_;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp162_ = self->priv->brightness_scale;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp163_ = lower;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp164_ = darker_label;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp162_, _tmp163_, GTK_POS_BOTTOM, _tmp164_);
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp165_ = self->priv->brightness_scale;
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp165_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp166_ = self->priv->brightness_scale;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp167_ = upper;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp168_ = lighter_label;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp166_, _tmp167_, GTK_POS_BOTTOM, _tmp168_);
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp169_ = self->priv->settings;
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp170_ = g_settings_get_int (_tmp169_, "brightness");
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_brightness (self, _tmp170_);
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp171_ = self->priv->brightness_adjustment;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp171_, "value-changed", (GCallback) ___lambda18__gtk_adjustment_value_changed, self, 0);
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp172_ = self->priv->contrast_adjustment;
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp173_ = gtk_adjustment_get_lower (_tmp172_);
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp174_ = _tmp173_;
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp174_;
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp175_ = _ ("Less");
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp176_ = g_strdup_printf ("<small>%s</small>", _tmp175_);
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	less_label = _tmp176_;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp177_ = self->priv->contrast_adjustment;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp178_ = gtk_adjustment_get_upper (_tmp177_);
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp179_ = _tmp178_;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp179_;
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp180_ = _ ("More");
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp181_ = g_strdup_printf ("<small>%s</small>", _tmp180_);
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	more_label = _tmp181_;
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp182_ = self->priv->contrast_scale;
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp183_ = lower;
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp184_ = less_label;
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp182_, _tmp183_, GTK_POS_BOTTOM, _tmp184_);
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp185_ = self->priv->contrast_scale;
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp185_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp186_ = self->priv->contrast_scale;
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp187_ = upper;
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp188_ = more_label;
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp186_, _tmp187_, GTK_POS_BOTTOM, _tmp188_);
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp189_ = self->priv->settings;
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp190_ = g_settings_get_int (_tmp189_, "contrast");
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_contrast (self, _tmp190_);
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp191_ = self->priv->contrast_adjustment;
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp191_, "value-changed", (GCallback) ___lambda19__gtk_adjustment_value_changed, self, 0);
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp192_ = self->priv->quality_adjustment;
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp193_ = gtk_adjustment_get_lower (_tmp192_);
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp194_ = _tmp193_;
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp194_;
-#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp195_ = _ ("Minimum");
-#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp196_ = g_strdup_printf ("<small>%s</small>", _tmp195_);
-#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	minimum_label = _tmp196_;
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp197_ = self->priv->quality_adjustment;
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp198_ = gtk_adjustment_get_upper (_tmp197_);
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp199_ = _tmp198_;
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp199_;
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp200_ = _ ("Maximum");
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp201_ = g_strdup_printf ("<small>%s</small>", _tmp200_);
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	maximum_label = _tmp201_;
-#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp202_ = self->priv->quality_scale;
-#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp203_ = lower;
-#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp204_ = minimum_label;
-#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp202_, _tmp203_, GTK_POS_BOTTOM, _tmp204_);
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp205_ = self->priv->quality_scale;
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp205_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp206_ = self->priv->quality_scale;
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp207_ = upper;
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp208_ = maximum_label;
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp206_, _tmp207_, GTK_POS_BOTTOM, _tmp208_);
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp209_ = self->priv->settings;
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp210_ = g_settings_get_int (_tmp209_, "jpeg-quality");
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_quality (self, _tmp210_);
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp211_ = self->priv->quality_adjustment;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp211_, "value-changed", (GCallback) ___lambda20__gtk_adjustment_value_changed, self, 0);
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp212_ = self->priv->settings;
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp213_ = g_settings_get_string (_tmp212_, "document-type");
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	document_type = _tmp213_;
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp214_ = document_type;
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp214_ != NULL) {
-#line 10067 "ui.c"
-		const gchar* _tmp215_ = NULL;
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp215_ = document_type;
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, _tmp215_, FALSE);
-#line 10073 "ui.c"
-	}
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp216_ = self->priv->_book;
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp217_ = book_view_new (_tmp216_);
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp217_);
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->book_view);
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_view = _tmp217_;
-#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp218_ = self->priv->book_view;
-#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _tmp218_, (guint) 18);
-#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp219_ = self->priv->main_vbox;
-#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp220_ = self->priv->book_view;
-#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_end (_tmp219_, (GtkWidget*) _tmp220_, TRUE, TRUE, (guint) 0);
-#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp221_ = self->priv->book_view;
-#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp221_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
-#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp222_ = self->priv->book_view;
-#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp222_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
-#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp223_ = self->priv->book_view;
-#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp223_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
-#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp224_ = self->priv->book_view;
-#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp224_, TRUE);
-#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp225_ = self->priv->authorize_dialog;
-#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp225_, (GtkWindow*) self);
-#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp226_ = self->priv->preferences_dialog;
-#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp226_, (GtkWindow*) self);
-#line 1992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_load_state (self);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp227_ = self->priv->window_width;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp228_ = self->priv->window_height;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1995: Restoring window to %dx%d pixels", _tmp227_, _tmp228_);
-#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp229_ = self->priv->window_width;
-#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp230_ = self->priv->window_height;
-#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_default_size ((GtkWindow*) self, _tmp229_, _tmp230_);
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp231_ = self->priv->window_is_maximized;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp231_) {
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_debug ("ui.vala:1999: Restoring window to maximized");
-#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_window_maximize ((GtkWindow*) self);
-#line 10141 "ui.c"
-	}
-#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp232_ = self->priv->window_is_fullscreen;
-#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp232_) {
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_debug ("ui.vala:2004: Restoring window to fullscreen");
-#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_window_fullscreen ((GtkWindow*) self);
-#line 10151 "ui.c"
-	}
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp233_ = _ ("Saving document...");
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp234_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp233_);
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp234_);
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->progress_dialog);
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->progress_dialog = _tmp234_;
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp235_ = self->priv->_book;
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp235_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (document_type);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (maximum_label);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (minimum_label);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (more_label);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (less_label);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (lighter_label);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (darker_label);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (renderer);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (content_area);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (hbox);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (app);
-#line 10189 "ui.c"
-}
-
-
-static gboolean user_interface_is_desktop (UserInterface* self, const gchar* name) {
-	gboolean result = FALSE;
-	gchar* desktop_name_list = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (name != NULL, FALSE);
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = g_getenv ("XDG_CURRENT_DESKTOP");
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	desktop_name_list = _tmp1_;
-#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = desktop_name_list;
-#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_ == NULL) {
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = FALSE;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (desktop_name_list);
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 10222 "ui.c"
-	}
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = desktop_name_list;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 0);
-#line 10228 "ui.c"
-	{
-		gchar** n_collection = NULL;
-		gint n_collection_length1 = 0;
-		gint _n_collection_size_ = 0;
-		gint n_it = 0;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		n_collection = _tmp5_;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		n_collection_length1 = _vala_array_length (_tmp4_);
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		for (n_it = 0; n_it < _vala_array_length (_tmp4_); n_it = n_it + 1) {
-#line 10240 "ui.c"
-			gchar* _tmp6_ = NULL;
-			gchar* n = NULL;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp6_ = g_strdup (n_collection[n_it]);
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			n = _tmp6_;
-#line 10247 "ui.c"
-			{
-				const gchar* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp7_ = n;
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp8_ = name;
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					result = TRUE;
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_g_free0 (n);
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_g_free0 (desktop_name_list);
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					return result;
-#line 10267 "ui.c"
-				}
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (n);
-#line 10271 "ui.c"
-			}
-		}
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 10276 "ui.c"
-	}
-#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = FALSE;
-#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (desktop_name_list);
-#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 10284 "ui.c"
-}
-
-
-static gboolean user_interface_is_traditional_desktop (UserInterface* self) {
-	gboolean result = FALSE;
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static const gchar* traditional_desktops[] = {"Unity", "XFCE", "MATE", "LXDE", "Cinnamon", "X-Cinnamon"};
-#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 10294 "ui.c"
-	{
-		const gchar** name_collection = NULL;
-		gint name_collection_length1 = 0;
-		gint _name_collection_size_ = 0;
-		gint name_it = 0;
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		name_collection = traditional_desktops;
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		name_collection_length1 = G_N_ELEMENTS (traditional_desktops);
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		for (name_it = 0; name_it < G_N_ELEMENTS (traditional_desktops); name_it = name_it + 1) {
-#line 10306 "ui.c"
-			const gchar* name = NULL;
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			name = name_collection[name_it];
-#line 10310 "ui.c"
-			{
-				const gchar* _tmp0_ = NULL;
-				gboolean _tmp1_ = FALSE;
-#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp0_ = name;
-#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp1_ = user_interface_is_desktop (self, _tmp0_);
-#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp1_) {
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					result = TRUE;
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					return result;
-#line 10324 "ui.c"
-				}
-			}
-		}
-	}
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = FALSE;
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 10333 "ui.c"
-}
-
-
-static void user_interface_load_state (UserInterface* self) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GKeyFile* f = NULL;
-	GKeyFile* _tmp3_ = NULL;
-	GKeyFile* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	GKeyFile* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	GKeyFile* _tmp17_ = NULL;
-	gboolean _tmp18_ = FALSE;
-	GKeyFile* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	GKeyFile* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	GKeyFile* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	GKeyFile* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	GKeyFile* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	GQuark _tmp31_ = 0U;
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp30_label0 = 0;
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp30_label1 = 0;
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp30_label2 = 0;
-#line 10369 "ui.c"
-	GError * _inner_error_ = NULL;
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = user_interface_get_state_filename (self);
-#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _tmp0_;
-#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2041: Loading state from %s", _tmp2_);
-#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp2_);
-#line 2043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = g_key_file_new ();
-#line 2043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	f = _tmp3_;
-#line 10387 "ui.c"
-	{
-		GKeyFile* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = f;
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = user_interface_get_state_filename (self);
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = _tmp5_;
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = _tmp6_;
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_key_file_load_from_file (_tmp4_, _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp7_);
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10407 "ui.c"
-			goto __catch23_g_error;
-		}
-	}
-	goto __finally23;
-	__catch23_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp8_ = NULL;
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = e;
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 10424 "ui.c"
-			GError* _tmp9_ = NULL;
-			const gchar* _tmp10_ = NULL;
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp9_ = e;
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp10_ = _tmp9_->message;
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_warning ("ui.vala:2051: Failed to load state: %s", _tmp10_);
-#line 10433 "ui.c"
-		}
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 10437 "ui.c"
-	}
-	__finally23:
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_key_file_unref0 (f);
-#line 2044 "/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 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 10450 "ui.c"
-	}
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = f;
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->window_width = _tmp12_;
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = self->priv->window_width;
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp13_ <= 0) {
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_width = 600;
-#line 10464 "ui.c"
-	}
-#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = f;
-#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
-#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->window_height = _tmp15_;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = self->priv->window_height;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp16_ <= 0) {
-#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_height = 400;
-#line 10478 "ui.c"
-	}
-#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = f;
-#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
-#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->window_is_maximized = _tmp18_;
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = f;
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = user_interface_state_get_boolean (self, _tmp19_, "window", "is-fullscreen", FALSE);
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->window_is_fullscreen = _tmp20_;
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = f;
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "width", 595);
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_width = _tmp22_;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = f;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "height", 842);
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_height = _tmp24_;
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = f;
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = user_interface_state_get_integer (self, _tmp25_, "last-page", "dpi", 72);
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_dpi = _tmp26_;
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = f;
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = user_interface_state_get_string (self, _tmp27_, "last-page", "scan-direction", "top-to-bottom");
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = _tmp28_;
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = (NULL == _tmp29_) ? 0 : g_quark_from_string (_tmp29_);
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_free (_tmp29_);
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp31_ == ((0 != _tmp30_label0) ? _tmp30_label0 : (_tmp30_label0 = g_quark_from_static_string ("bottom-to-top")))) {
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		switch (0) {
-#line 10524 "ui.c"
-			default:
-			{
-#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 10531 "ui.c"
-			}
-		}
-	} else if (_tmp31_ == ((0 != _tmp30_label1) ? _tmp30_label1 : (_tmp30_label1 = g_quark_from_static_string ("left-to-right")))) {
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		switch (0) {
-#line 10537 "ui.c"
-			default:
-			{
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 10544 "ui.c"
-			}
-		}
-	} else if (_tmp31_ == ((0 != _tmp30_label2) ? _tmp30_label2 : (_tmp30_label2 = g_quark_from_static_string ("right-to-left")))) {
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		switch (0) {
-#line 10550 "ui.c"
-			default:
-			{
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 10557 "ui.c"
-			}
-		}
-	} else {
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		switch (0) {
-#line 10563 "ui.c"
-			default:
-			{
-#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				break;
-#line 10570 "ui.c"
-			}
-		}
-	}
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_key_file_unref0 (f);
-#line 10576 "ui.c"
-}
-
-
-static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gint _default_) {
-	gint result = 0;
-	gint _tmp6_ = 0;
-	GError * _inner_error_ = NULL;
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (f != NULL, 0);
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (group_name != NULL, 0);
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (key != NULL, 0);
-#line 10592 "ui.c"
-	{
-		gint _tmp0_ = 0;
-		GKeyFile* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = f;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = group_name;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = key;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = _tmp4_;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10611 "ui.c"
-			goto __catch24_g_error;
-		}
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = _tmp0_;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 10618 "ui.c"
-	}
-	goto __finally24;
-	__catch24_g_error:
-	{
-		gint _tmp5_ = 0;
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _default_;
-#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = _tmp5_;
-#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 10634 "ui.c"
-	}
-	__finally24:
-#line 2084 "/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 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_clear_error (&_inner_error_);
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return _tmp6_;
-#line 10643 "ui.c"
-}
-
-
-static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gboolean _default_) {
-	gboolean result = FALSE;
-	gboolean _tmp6_ = FALSE;
-	GError * _inner_error_ = NULL;
-#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (f != NULL, FALSE);
-#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (key != NULL, FALSE);
-#line 10659 "ui.c"
-	{
-		gboolean _tmp0_ = FALSE;
-		GKeyFile* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = f;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = group_name;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = key;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = _tmp4_;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10678 "ui.c"
-			goto __catch25_g_error;
-		}
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = _tmp0_;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 10685 "ui.c"
-	}
-	goto __finally25;
-	__catch25_g_error:
-	{
-		gboolean _tmp5_ = FALSE;
-#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _default_;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = _tmp5_;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 10701 "ui.c"
-	}
-	__finally25:
-#line 2096 "/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 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_clear_error (&_inner_error_);
-#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return _tmp6_;
-#line 10710 "ui.c"
-}
-
-
-static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_) {
-	gchar* result = NULL;
-	GError * _inner_error_ = NULL;
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (f != NULL, NULL);
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (group_name != NULL, NULL);
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (key != NULL, NULL);
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 10727 "ui.c"
-	{
-		gchar* _tmp0_ = NULL;
-		GKeyFile* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = f;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = group_name;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = key;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = g_key_file_get_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = _tmp4_;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10747 "ui.c"
-			goto __catch26_g_error;
-		}
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _tmp0_;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = NULL;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = _tmp5_;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp0_);
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 10760 "ui.c"
-	}
-	goto __finally26;
-	__catch26_g_error:
-	{
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = _default_;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = g_strdup (_tmp6_);
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = _tmp7_;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 10779 "ui.c"
-	}
-	__finally26:
-#line 2108 "/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 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_clear_error (&_inner_error_);
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return NULL;
-#line 10788 "ui.c"
-}
-
-
-static gboolean ___lambda11_ (UserInterface* self) {
-	gboolean result = FALSE;
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_state (self, TRUE);
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_state_timeout = (guint) 0;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = FALSE;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 10802 "ui.c"
-}
-
-
-static gboolean ____lambda11__gsource_func (gpointer self) {
-	gboolean result;
-	result = ___lambda11_ ((UserInterface*) self);
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 10811 "ui.c"
-}
-
-
-static void user_interface_save_state (UserInterface* self, gboolean force) {
-	gboolean _tmp0_ = FALSE;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GKeyFile* f = NULL;
-	GKeyFile* _tmp7_ = NULL;
-	GKeyFile* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	GKeyFile* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	GKeyFile* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	GKeyFile* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	GKeyFile* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	GKeyFile* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	GKeyFile* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	ScanDirection _tmp22_ = 0;
-	GError * _inner_error_ = NULL;
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = force;
-#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp0_) {
-#line 10844 "ui.c"
-		guint _tmp1_ = 0U;
-		guint _tmp3_ = 0U;
-#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = self->priv->save_state_timeout;
-#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp1_ != ((guint) 0)) {
-#line 10851 "ui.c"
-			guint _tmp2_ = 0U;
-#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp2_ = self->priv->save_state_timeout;
-#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_source_remove (_tmp2_);
-#line 10857 "ui.c"
-		}
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda11__gsource_func, g_object_ref (self), g_object_unref);
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->save_state_timeout = _tmp3_;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 10865 "ui.c"
-	}
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = user_interface_get_state_filename (self);
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _tmp4_;
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = _tmp5_;
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2133: Saving state to %s", _tmp6_);
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp6_);
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = g_key_file_new ();
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	f = _tmp7_;
-#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = f;
-#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = self->priv->window_width;
-#line 2136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = f;
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = self->priv->window_height;
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
-#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = f;
-#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = self->priv->window_is_maximized;
-#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = f;
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = self->priv->window_is_fullscreen;
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_boolean (_tmp14_, "window", "is-fullscreen", _tmp15_);
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = f;
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = self->priv->default_page_width;
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_integer (_tmp16_, "last-page", "width", _tmp17_);
-#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = f;
-#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = self->priv->default_page_height;
-#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_integer (_tmp18_, "last-page", "height", _tmp19_);
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = f;
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = self->priv->default_page_dpi;
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_integer (_tmp20_, "last-page", "dpi", _tmp21_);
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = self->priv->default_page_scan_direction;
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (_tmp22_) {
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 10929 "ui.c"
-		{
-			GKeyFile* _tmp23_ = NULL;
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp23_ = f;
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "top-to-bottom");
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			break;
-#line 10938 "ui.c"
-		}
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 10942 "ui.c"
-		{
-			GKeyFile* _tmp24_ = NULL;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp24_ = f;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "bottom-to-top");
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			break;
-#line 10951 "ui.c"
-		}
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 10955 "ui.c"
-		{
-			GKeyFile* _tmp25_ = NULL;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp25_ = f;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_key_file_set_value (_tmp25_, "last-page", "scan-direction", "left-to-right");
-#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			break;
-#line 10964 "ui.c"
-		}
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 10968 "ui.c"
-		{
-			GKeyFile* _tmp26_ = NULL;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp26_ = f;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_key_file_set_value (_tmp26_, "last-page", "scan-direction", "right-to-left");
-#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			break;
-#line 10977 "ui.c"
-		}
-		default:
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 10982 "ui.c"
-	}
-	{
-		gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		GKeyFile* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp27_ = user_interface_get_state_filename (self);
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp28_ = _tmp27_;
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp29_ = _tmp28_;
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp30_ = f;
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp31_ = g_key_file_to_data (_tmp30_, NULL, NULL);
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp32_ = _tmp31_;
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_file_set_contents (_tmp29_, _tmp32_, (gssize) -1, &_inner_error_);
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp32_);
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp29_);
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11011 "ui.c"
-			goto __catch27_g_error;
-		}
-	}
-	goto __finally27;
-	__catch27_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
-#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 2164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp33_ = e;
-#line 2164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp34_ = _tmp33_->message;
-#line 2164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2164: Failed to write state: %s", _tmp34_);
-#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 11033 "ui.c"
-	}
-	__finally27:
-#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_key_file_unref0 (f);
-#line 2158 "/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 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 11046 "ui.c"
-	}
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_key_file_unref0 (f);
-#line 11050 "ui.c"
-}
-
-
-static gboolean ___lambda21_ (UserInterface* self) {
-	gboolean result = FALSE;
-	ProgressBarDialog* _tmp0_ = NULL;
-#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->progress_dialog;
-#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 2180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = FALSE;
-#line 2180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11065 "ui.c"
-}
-
-
-static gboolean ____lambda21__gsource_func (gpointer self) {
-	gboolean result;
-	result = ___lambda21_ ((UserInterface*) self);
-#line 2178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11074 "ui.c"
-}
-
-
-static void user_interface_book_saving_cb (UserInterface* self, gint page_number) {
-	gint total = 0;
-	Book* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	gdouble fraction = 0.0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gboolean complete = FALSE;
-	gdouble _tmp6_ = 0.0;
-	gboolean _tmp7_ = FALSE;
-	gchar* message = NULL;
-	const gchar* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gchar* _tmp11_ = NULL;
-	ProgressBarDialog* _tmp12_ = NULL;
-	gdouble _tmp13_ = 0.0;
-	ProgressBarDialog* _tmp14_ = NULL;
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	while (TRUE) {
-#line 11101 "ui.c"
-		gboolean _tmp0_ = FALSE;
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = gtk_events_pending ();
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (!_tmp0_) {
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			break;
-#line 11109 "ui.c"
-		}
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_main_iteration ();
-#line 11113 "ui.c"
-	}
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->_book;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp2_;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	total = (gint) _tmp3_;
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page_number;
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = total;
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	fraction = (_tmp4_ + 1.0) / _tmp5_;
-#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = fraction;
-#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	complete = _tmp6_ == 1.0;
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = complete;
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp7_) {
-#line 2178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda21__gsource_func, g_object_ref (self), g_object_unref);
-#line 11139 "ui.c"
-	}
-#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = _ ("Saving page %d out of %d");
-#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = page_number;
-#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = total;
-#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
-#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	message = _tmp11_;
-#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = self->priv->progress_dialog;
-#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = fraction;
-#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
-#line 2185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = self->priv->progress_dialog;
-#line 2185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	progress_bar_dialog_set_message (_tmp14_, message);
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (message);
-#line 11163 "ui.c"
-}
-
-
-void user_interface_show_progress_dialog (UserInterface* self) {
-	ProgressBarDialog* _tmp0_ = NULL;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->progress_dialog;
-#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 11175 "ui.c"
-}
-
-
-void user_interface_hide_progress_dialog (UserInterface* self) {
-	ProgressBarDialog* _tmp0_ = NULL;
-#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->progress_dialog;
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 11187 "ui.c"
-}
-
-
-void user_interface_show_error (UserInterface* self, const gchar* error_title, const gchar* error_text, gboolean change_scanner_hint) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-#line 2198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 2198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (error_title != NULL);
-#line 2198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (error_text != NULL);
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->have_error = TRUE;
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = error_title;
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->error_title);
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->error_title = _tmp1_;
-#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = error_text;
-#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->error_text);
-#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->error_text = _tmp3_;
-#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = change_scanner_hint;
-#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->error_change_scanner_hint = _tmp4_;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_update_info_bar (self);
-#line 11227 "ui.c"
-}
-
-
-void user_interface_start (UserInterface* self) {
-#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
-#line 11236 "ui.c"
-}
-
-
-Book* user_interface_get_book (UserInterface* self) {
-	Book* result;
-	Book* _tmp0_ = NULL;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->_book;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp0_;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11251 "ui.c"
-}
-
-
-static gpointer _book_ref0 (gpointer self) {
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self ? book_ref (self) : NULL;
-#line 11258 "ui.c"
-}
-
-
-static void user_interface_set_book (UserInterface* self, Book* value) {
-	Book* _tmp0_ = NULL;
-	Book* _tmp1_ = NULL;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = value;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _book_ref0 (_tmp0_);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_book_unref0 (self->priv->_book);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->_book = _tmp1_;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "book");
-#line 11277 "ui.c"
-}
-
-
-Page* user_interface_get_selected_page (UserInterface* self) {
-	Page* result;
-	BookView* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book_view;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp2_;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11298 "ui.c"
-}
-
-
-void user_interface_set_selected_page (UserInterface* self, Page* value) {
-	BookView* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book_view;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = value;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_view_set_selected_page (_tmp0_, _tmp1_);
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "selected-page");
-#line 11315 "ui.c"
-}
-
-
-gboolean user_interface_get_scanning (UserInterface* self) {
-	gboolean result;
-	gboolean _tmp0_ = FALSE;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->scanning_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp0_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11330 "ui.c"
-}
-
-
-void user_interface_set_scanning (UserInterface* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
-	GtkMenuItem* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GtkMenuItem* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GtkToolButton* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GtkButton* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	GtkButton* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = value;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->scanning_ = _tmp0_;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->page_delete_menuitem;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = value;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp1_, !_tmp2_);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->stop_scan_menuitem;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = value;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, _tmp4_);
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = self->priv->stop_toolbutton;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = value;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, _tmp6_);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = self->priv->scan_button;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = value;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp7_, !_tmp8_);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = self->priv->stop_button;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = value;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp9_, _tmp10_);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "scanning");
-#line 11384 "ui.c"
-}
-
-
-gint user_interface_get_brightness (UserInterface* self) {
-	gint result;
-	GtkAdjustment* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->brightness_adjustment;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (gint) _tmp2_;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11405 "ui.c"
-}
-
-
-void user_interface_set_brightness (UserInterface* self, gint value) {
-	GtkAdjustment* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->brightness_adjustment;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = value;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "brightness");
-#line 11422 "ui.c"
-}
-
-
-gint user_interface_get_contrast (UserInterface* self) {
-	gint result;
-	GtkAdjustment* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->contrast_adjustment;
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (gint) _tmp2_;
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11443 "ui.c"
-}
-
-
-void user_interface_set_contrast (UserInterface* self, gint value) {
-	GtkAdjustment* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->contrast_adjustment;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = value;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "contrast");
-#line 11460 "ui.c"
-}
-
-
-gint user_interface_get_quality (UserInterface* self) {
-	gint result;
-	GtkAdjustment* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->quality_adjustment;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (gint) _tmp2_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11481 "ui.c"
-}
-
-
-void user_interface_set_quality (UserInterface* self, gint value) {
-	GtkAdjustment* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->quality_adjustment;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = value;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "quality");
-#line 11498 "ui.c"
-}
-
-
-gchar* user_interface_get_selected_device (UserInterface* self) {
-	gchar* result;
-	GtkTreeIter iter = {0};
-	GtkComboBox* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->device_combo;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp1_;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 11518 "ui.c"
-		gchar* device = NULL;
-		GtkListStore* _tmp3_ = NULL;
-		GtkTreeIter _tmp4_ = {0};
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->device_model;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = iter;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &device, -1, -1);
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = device;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 11532 "ui.c"
-	}
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = NULL;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11538 "ui.c"
-}
-
-
-void user_interface_set_selected_device (UserInterface* self, const gchar* value) {
-	GtkTreeIter iter = {0};
-	const gchar* _tmp0_ = NULL;
-	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	GtkComboBox* _tmp3_ = NULL;
-	GtkTreeIter _tmp4_ = {0};
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = value;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = user_interface_find_scan_device (self, _tmp0_, &_tmp1_);
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp1_;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp2_) {
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 11561 "ui.c"
-	}
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->device_combo;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = iter;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_combo_box_set_active_iter (_tmp3_, &_tmp4_);
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->user_selected_device = TRUE;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "selected-device");
-#line 11573 "ui.c"
-}
-
-
-static gchar* user_interface_get_state_filename (UserInterface* self) {
-	gchar* result;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = g_get_user_cache_dir ();
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp1_;
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 11591 "ui.c"
-}
-
-
-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) {
-	typedef void (*GMarshalFunc_VOID__STRING_SCAN_OPTIONS) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer data2);
-	register GMarshalFunc_VOID__STRING_SCAN_OPTIONS callback;
-	register GCClosure * cc;
-	register gpointer data1;
-	register gpointer data2;
-	cc = (GCClosure *) closure;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (n_param_values == 3);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		data1 = closure->data;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		data2 = param_values->data[0].v_pointer;
-#line 11610 "ui.c"
-	} else {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		data1 = param_values->data[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		data2 = closure->data;
-#line 11616 "ui.c"
-	}
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	callback = (GMarshalFunc_VOID__STRING_SCAN_OPTIONS) (marshal_data ? marshal_data : cc->callback);
-#line 14 "/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 11622 "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 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (n_param_values == 3);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		data1 = closure->data;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		data2 = param_values->data[0].v_pointer;
-#line 11641 "ui.c"
-	} else {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		data1 = param_values->data[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		data2 = closure->data;
-#line 11647 "ui.c"
-	}
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
-#line 14 "/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 11653 "ui.c"
-}
-
-
-static void user_interface_class_init (UserInterfaceClass * klass) {
-	gint UserInterface_private_offset;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_parent_class = g_type_class_peek_parent (klass);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_type_class_add_private (klass, sizeof (UserInterfacePrivate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	((GtkWidgetClass *) klass)->size_allocate = (void (*)(GtkWidget*, GtkAllocation*)) user_interface_real_size_allocate;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	((GtkWidgetClass *) klass)->window_state_event = (gboolean (*)(GtkWidget*, GdkEventWindowState*)) user_interface_real_window_state_event;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (klass)->get_property = _vala_user_interface_get_property;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (klass)->set_property = _vala_user_interface_set_property;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (klass)->finalize = user_interface_finalize;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_BOOK, param_spec_book ("book", "book", "book", TYPE_BOOK, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SELECTED_PAGE, param_spec_page ("selected-page", "selected-page", "selected-page", TYPE_PAGE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SCANNING, g_param_spec_boolean ("scanning", "scanning", "scanning", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_BRIGHTNESS, g_param_spec_int ("brightness", "brightness", "brightness", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_CONTRAST, g_param_spec_int ("contrast", "contrast", "contrast", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_QUALITY, g_param_spec_int ("quality", "quality", "quality", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SELECTED_DEVICE, g_param_spec_string ("selected-device", "selected-device", "selected-device", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	UserInterface_private_offset = g_type_class_get_instance_private_offset (klass);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/SimpleScan/simple-scan.ui");
-#line 14 "/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 14 "/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);
-#line 14 "/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 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "menubar", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, menubar));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "toolbar", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, toolbar));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_menu", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_menu));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "main_vbox", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, main_vbox));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "custom_crop_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, custom_crop_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "a4_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, a4_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "a5_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, a5_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "a6_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, a6_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "letter_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, letter_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "legal_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, legal_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "four_by_six_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, four_by_six_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "no_crop_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, no_crop_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_move_left_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_move_left_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_move_right_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_move_right_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_delete_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_delete_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "crop_rotate_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, crop_rotate_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_as_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_as_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "copy_to_clipboard_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, copy_to_clipboard_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_button));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_toolbutton", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_toolbutton));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stop_scan_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, stop_scan_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stop_toolbutton", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, stop_toolbutton));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "crop_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, crop_button));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "crop_toolbutton", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, crop_toolbutton));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stop_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, stop_button));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "scan_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, scan_button));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_button_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_button_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_button_hb_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_button_hb_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_button_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_button_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_button_hb_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_button_hb_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "authorize_dialog", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, authorize_dialog));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "authorize_label", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, authorize_label));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "username_entry", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, username_entry));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "password_entry", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, password_entry));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "preferences_dialog", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, preferences_dialog));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "device_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, device_combo));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_dpi_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_dpi_combo));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_dpi_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_dpi_combo));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_side_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_side_combo));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "paper_size_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, paper_size_combo));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "brightness_scale", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, brightness_scale));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "contrast_scale", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, contrast_scale));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "quality_scale", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, quality_scale));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "device_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, device_model));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_dpi_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_dpi_model));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_dpi_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_dpi_model));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_side_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_side_model));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "paper_size_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, paper_size_model));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "brightness_adjustment", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, brightness_adjustment));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "contrast_adjustment", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, contrast_adjustment));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "quality_adjustment", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, quality_adjustment));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "device_combo_changed_cb", G_CALLBACK(_user_interface_device_combo_changed_cb_gtk_combo_box_changed));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "new_button_clicked_cb", G_CALLBACK(_user_interface_new_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "text_menuitem_toggled_cb", G_CALLBACK(_user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "photo_menuitem_toggled_cb", G_CALLBACK(_user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "scan_button_clicked_cb", G_CALLBACK(_user_interface_scan_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "stop_scan_button_clicked_cb", G_CALLBACK(_user_interface_stop_scan_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "continuous_scan_button_clicked_cb", G_CALLBACK(_user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "preferences_button_clicked_cb", G_CALLBACK(_user_interface_preferences_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "preferences_dialog_delete_event_cb", G_CALLBACK(_user_interface_preferences_dialog_delete_event_cb_gtk_widget_delete_event));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "preferences_dialog_response_cb", G_CALLBACK(_user_interface_preferences_dialog_response_cb_gtk_dialog_response));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "rotate_left_button_clicked_cb", G_CALLBACK(_user_interface_rotate_left_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "rotate_right_button_clicked_cb", G_CALLBACK(_user_interface_rotate_right_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "no_crop_menuitem_toggled_cb", G_CALLBACK(_user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "custom_crop_menuitem_toggled_cb", G_CALLBACK(_user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "crop_button_toggled_cb", G_CALLBACK(_user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "crop_toolbutton_toggled_cb", G_CALLBACK(_user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "four_by_six_menuitem_toggled_cb", G_CALLBACK(_user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "legal_menuitem_toggled_cb", G_CALLBACK(_user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "letter_menuitem_toggled_cb", G_CALLBACK(_user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "a6_menuitem_toggled_cb", G_CALLBACK(_user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "a5_menuitem_toggled_cb", G_CALLBACK(_user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "a4_menuitem_toggled_cb", G_CALLBACK(_user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "crop_rotate_menuitem_activate_cb", G_CALLBACK(_user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "page_move_left_menuitem_activate_cb", G_CALLBACK(_user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "page_move_right_menuitem_activate_cb", G_CALLBACK(_user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "page_delete_menuitem_activate_cb", G_CALLBACK(_user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "reorder_menuitem_activate_cb", G_CALLBACK(_user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "save_file_button_clicked_cb", G_CALLBACK(_user_interface_save_file_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "copy_to_clipboard_button_clicked_cb", G_CALLBACK(_user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "save_as_file_button_clicked_cb", G_CALLBACK(_user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "email_button_clicked_cb", G_CALLBACK(_user_interface_email_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "print_button_clicked_cb", G_CALLBACK(_user_interface_print_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "help_contents_menuitem_activate_cb", G_CALLBACK(_user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "about_menuitem_activate_cb", G_CALLBACK(_user_interface_about_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "quit_menuitem_activate_cb", G_CALLBACK(_user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "window_delete_event_cb", G_CALLBACK(_user_interface_window_delete_event_cb_gtk_widget_delete_event));
-#line 11877 "ui.c"
-}
-
-
-static void user_interface_instance_init (UserInterface * self) {
-	gchar* _tmp0_ = NULL;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv = USER_INTERFACE_GET_PRIVATE (self);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->missing_driver = NULL;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_uri = NULL;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = g_strdup ("photo");
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->document_hint = _tmp0_;
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->scanning_ = FALSE;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_init_template (GTK_WIDGET (self));
-#line 11897 "ui.c"
-}
-
-
-static void user_interface_finalize (GObject* obj) {
-	UserInterface * self;
-	Book* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	Book* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	Book* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_USER_INTERFACE, UserInterface);
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->_book;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp1_, NULL, FALSE);
-#line 288 "/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_added_cb_book_page_added, self);
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->_book;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp3_, NULL, FALSE);
-#line 289 "/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_reordered_cb_book_reordered, self);
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->_book;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp5_, NULL, FALSE);
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
-#line 33 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->settings);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->menubar);
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->toolbar);
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_menu);
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->main_vbox);
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_image);
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_label);
-#line 46 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 48 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_install_button);
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->custom_crop_menuitem);
-#line 52 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->a4_menuitem);
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->a5_menuitem);
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->a6_menuitem);
-#line 58 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->letter_menuitem);
-#line 60 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->legal_menuitem);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->four_by_six_menuitem);
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->no_crop_menuitem);
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_move_left_menuitem);
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_move_right_menuitem);
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_delete_menuitem);
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->crop_rotate_menuitem);
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_menuitem);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_as_menuitem);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_button);
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_toolbutton);
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->stop_scan_menuitem);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->stop_toolbutton);
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->crop_button);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->crop_toolbutton);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->stop_button);
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->scan_button);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_button_menuitem);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_button_hb_menuitem);
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_menuitem);
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_button_menuitem);
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_button_hb_menuitem);
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_menuitem);
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->authorize_dialog);
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->authorize_label);
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->username_entry);
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->password_entry);
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->preferences_dialog);
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->device_combo);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_dpi_combo);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_dpi_combo);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_side_combo);
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->paper_size_combo);
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->brightness_scale);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->contrast_scale);
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->quality_scale);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->device_model);
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_dpi_model);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_dpi_model);
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_side_model);
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->paper_size_model);
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->brightness_adjustment);
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->contrast_adjustment);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->quality_adjustment);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->missing_driver);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_dialog);
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->progress_dialog);
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->error_title);
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->error_text);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_book_unref0 (self->priv->_book);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->book_uri);
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->book_view);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->document_hint);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (user_interface_parent_class)->finalize (obj);
-#line 12073 "ui.c"
-}
-
-
-GType user_interface_get_type (void) {
-	static volatile gsize user_interface_type_id__volatile = 0;
-	if (g_once_init_enter (&user_interface_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (UserInterfaceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) user_interface_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (UserInterface), 0, (GInstanceInitFunc) user_interface_instance_init, NULL };
-		GType user_interface_type_id;
-		user_interface_type_id = g_type_register_static (gtk_application_window_get_type (), "UserInterface", &g_define_type_info, 0);
-		g_once_init_leave (&user_interface_type_id__volatile, user_interface_type_id);
-	}
-	return user_interface_type_id__volatile;
-}
-
-
-static void _vala_user_interface_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
-	UserInterface * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_USER_INTERFACE, UserInterface);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (property_id) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_BOOK:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		value_set_book (value, user_interface_get_book (self));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_SELECTED_PAGE:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		value_set_page (value, user_interface_get_selected_page (self));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_SCANNING:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_value_set_boolean (value, user_interface_get_scanning (self));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_BRIGHTNESS:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_value_set_int (value, user_interface_get_brightness (self));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_CONTRAST:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_value_set_int (value, user_interface_get_contrast (self));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_QUALITY:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_value_set_int (value, user_interface_get_quality (self));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_SELECTED_DEVICE:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_value_take_string (value, user_interface_get_selected_device (self));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 12136 "ui.c"
-		default:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 12142 "ui.c"
-	}
-}
-
-
-static void _vala_user_interface_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
-	UserInterface * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_USER_INTERFACE, UserInterface);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (property_id) {
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_BOOK:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_book (self, value_get_book (value));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_SELECTED_PAGE:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_selected_page (self, value_get_page (value));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_SCANNING:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_scanning (self, g_value_get_boolean (value));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_BRIGHTNESS:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_brightness (self, g_value_get_int (value));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_CONTRAST:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_contrast (self, g_value_get_int (value));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_QUALITY:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_quality (self, g_value_get_int (value));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_SELECTED_DEVICE:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_selected_device (self, g_value_get_string (value));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 12194 "ui.c"
-		default:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 12200 "ui.c"
-	}
-}
-
-
-ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicationWindow* parent, const gchar* title) {
-	ProgressBarDialog * self = NULL;
-	GtkProgressBar* _tmp0_ = NULL;
-	GtkBox* hbox = NULL;
-	GtkBox* _tmp1_ = NULL;
-	GtkBox* vbox = NULL;
-	GtkBox* _tmp2_ = NULL;
-	GtkProgressBar* _tmp3_ = NULL;
-	GtkProgressBar* _tmp4_ = NULL;
-	GtkProgressBar* _tmp5_ = NULL;
-	GtkProgressBar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GtkApplicationWindow* _tmp8_ = NULL;
-	GtkProgressBar* _tmp9_ = NULL;
-#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (parent != NULL, NULL);
-#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (title != NULL, NULL);
-#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
-#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp0_);
-#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->bar);
-#line 2231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->bar = _tmp0_;
-#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp1_);
-#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	hbox = _tmp1_;
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp2_);
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	vbox = _tmp2_;
-#line 2234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
-#line 2236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->bar;
-#line 2236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_progress_bar_set_text (_tmp3_, "");
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->bar;
-#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = self->priv->bar;
-#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 2239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
-#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = self->priv->bar;
-#line 2241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = title;
-#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
-#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = parent;
-#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
-#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) hbox, TRUE);
-#line 2252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 2253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = self->priv->bar;
-#line 2253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp9_, TRUE);
-#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (vbox);
-#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (hbox);
-#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self;
-#line 12297 "ui.c"
-}
-
-
-ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
-#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 12304 "ui.c"
-}
-
-
-gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
-	gdouble result;
-	GtkProgressBar* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0.0);
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->bar;
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_progress_bar_get_fraction (_tmp0_);
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp2_;
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 12325 "ui.c"
-}
-
-
-void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
-	GtkProgressBar* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->bar;
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = value;
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "fraction");
-#line 12342 "ui.c"
-}
-
-
-const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
-	const gchar* result;
-	GtkProgressBar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->bar;
-#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_progress_bar_get_text (_tmp0_);
-#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _tmp1_;
-#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp2_;
-#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 12363 "ui.c"
-}
-
-
-void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value) {
-	GtkProgressBar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->bar;
-#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = value;
-#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "message");
-#line 12380 "ui.c"
-}
-
-
-static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (klass)->get_property = _vala_progress_bar_dialog_get_property;
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (klass)->set_property = _vala_progress_bar_dialog_set_property;
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_FRACTION, g_param_spec_double ("fraction", "fraction", "fraction", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_MESSAGE, g_param_spec_string ("message", "message", "message", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 12399 "ui.c"
-}
-
-
-static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 12406 "ui.c"
-}
-
-
-static void progress_bar_dialog_finalize (GObject* obj) {
-	ProgressBarDialog * self;
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->bar);
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 12418 "ui.c"
-}
-
-
-GType progress_bar_dialog_get_type (void) {
-	static volatile gsize progress_bar_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&progress_bar_dialog_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (ProgressBarDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) progress_bar_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ProgressBarDialog), 0, (GInstanceInitFunc) progress_bar_dialog_instance_init, NULL };
-		GType progress_bar_dialog_type_id;
-		progress_bar_dialog_type_id = g_type_register_static (gtk_window_get_type (), "ProgressBarDialog", &g_define_type_info, 0);
-		g_once_init_leave (&progress_bar_dialog_type_id__volatile, progress_bar_dialog_type_id);
-	}
-	return progress_bar_dialog_type_id__volatile;
-}
-
-
-static void _vala_progress_bar_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
-	ProgressBarDialog * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (property_id) {
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_value_set_double (value, progress_bar_dialog_get_fraction (self));
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_value_set_string (value, progress_bar_dialog_get_message (self));
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 12451 "ui.c"
-		default:
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 12457 "ui.c"
-	}
-}
-
-
-static void _vala_progress_bar_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
-	ProgressBarDialog * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (property_id) {
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		progress_bar_dialog_set_fraction (self, g_value_get_double (value));
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		progress_bar_dialog_set_message (self, g_value_get_string (value));
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 12479 "ui.c"
-		default:
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 12485 "ui.c"
-	}
-}
-
-
-gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
-	gchar* result = NULL;
-	gchar* filename = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* path = NULL;
-	GError * _inner_error_ = NULL;
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (prefix != NULL, NULL);
-#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (extension != NULL, NULL);
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = prefix;
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = extension;
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filename = _tmp2_;
-#line 12510 "ui.c"
-	{
-		gint fd = 0;
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = filename;
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (path);
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		path = _tmp4_;
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		fd = _tmp5_;
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12529 "ui.c"
-			goto __catch28_g_error;
-		}
-#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = fd;
-#line 2268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		close (_tmp6_);
-#line 12536 "ui.c"
-	}
-	goto __finally28;
-	__catch28_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = e;
-#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = _tmp7_->message;
-#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2272: Error saving email attachment: %s", _tmp8_);
-#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = NULL;
-#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (path);
-#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (filename);
-#line 2273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 12564 "ui.c"
-	}
-	__finally28:
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (path);
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (filename);
-#line 2265 "/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 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return NULL;
-#line 12579 "ui.c"
-	}
-#line 2276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = path;
-#line 2276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (filename);
-#line 2276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 12587 "ui.c"
-}
-
-
-PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r, gdouble g, gdouble b) {
-	PageIcon * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (text != NULL, NULL);
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) g_object_new (object_type, NULL);
-#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = text;
-#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->text);
-#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->text = _tmp1_;
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = r;
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->r = _tmp2_;
-#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = g;
-#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->g = _tmp3_;
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = b;
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->b = _tmp4_;
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self;
-#line 12624 "ui.c"
-}
-
-
-PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
-#line 12631 "ui.c"
-}
-
-
-static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_width, gint* natural_width) {
-	PageIcon * self;
-	gint _vala_minimum_width = 0;
-	gint _vala_natural_width = 0;
-#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) base;
-#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_natural_width = PAGE_ICON_MINIMUM_WIDTH;
-#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_minimum_width = _vala_natural_width;
-#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (minimum_width) {
-#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*minimum_width = _vala_minimum_width;
-#line 12649 "ui.c"
-	}
-#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (natural_width) {
-#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*natural_width = _vala_natural_width;
-#line 12655 "ui.c"
-	}
-}
-
-
-static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_height, gint* natural_height) {
-	PageIcon * self;
-	gint _vala_minimum_height = 0;
-	gint _vala_natural_height = 0;
-	gdouble _tmp0_ = 0.0;
-#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) base;
-#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = round (PAGE_ICON_MINIMUM_WIDTH * G_SQRT2);
-#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_natural_height = (gint) _tmp0_;
-#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_minimum_height = _vala_natural_height;
-#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (minimum_height) {
-#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*minimum_height = _vala_minimum_height;
-#line 12677 "ui.c"
-	}
-#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (natural_height) {
-#line 2300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*natural_height = _vala_natural_height;
-#line 12683 "ui.c"
-	}
-}
-
-
-static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint width, gint* minimum_height, gint* natural_height) {
-	PageIcon * self;
-	gint _vala_minimum_height = 0;
-	gint _vala_natural_height = 0;
-	gint _tmp0_ = 0;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) base;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = width;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_natural_height = (gint) (_tmp0_ * G_SQRT2);
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_minimum_height = _vala_natural_height;
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (minimum_height) {
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*minimum_height = _vala_minimum_height;
-#line 12705 "ui.c"
-	}
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (natural_height) {
-#line 2305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*natural_height = _vala_natural_height;
-#line 12711 "ui.c"
-	}
-}
-
-
-static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint height, gint* minimum_width, gint* natural_width) {
-	PageIcon * self;
-	gint _vala_minimum_width = 0;
-	gint _vala_natural_width = 0;
-	gint _tmp0_ = 0;
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) base;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = height;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_natural_width = (gint) (_tmp0_ / G_SQRT2);
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_minimum_width = _vala_natural_width;
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (minimum_width) {
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*minimum_width = _vala_minimum_width;
-#line 12733 "ui.c"
-	}
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (natural_width) {
-#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*natural_width = _vala_natural_width;
-#line 12739 "ui.c"
-	}
-}
-
-
-static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
-	PageIcon * self;
-	gboolean result = FALSE;
-	gint w = 0;
-	gint _tmp0_ = 0;
-	gint h = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	cairo_t* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	cairo_t* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	cairo_t* _tmp16_ = NULL;
-	gdouble _tmp17_ = 0.0;
-	gdouble _tmp18_ = 0.0;
-	gdouble _tmp19_ = 0.0;
-	cairo_t* _tmp20_ = NULL;
-	cairo_t* _tmp21_ = NULL;
-	cairo_t* _tmp22_ = NULL;
-	cairo_t* _tmp23_ = NULL;
-	cairo_text_extents_t extents = {0};
-	cairo_t* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	cairo_text_extents_t _tmp26_ = {0};
-	cairo_t* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	cairo_text_extents_t _tmp29_ = {0};
-	gdouble _tmp30_ = 0.0;
-	gint _tmp31_ = 0;
-	cairo_text_extents_t _tmp32_ = {0};
-	gdouble _tmp33_ = 0.0;
-	cairo_t* _tmp34_ = NULL;
-	const gchar* _tmp35_ = NULL;
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) base;
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (c != NULL, FALSE);
-#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	w = _tmp0_;
-#line 2318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	h = _tmp1_;
-#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = w;
-#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = h;
-#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
-#line 12800 "ui.c"
-		gint _tmp4_ = 0;
-		gdouble _tmp5_ = 0.0;
-#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = h;
-#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = round (_tmp4_ / G_SQRT2);
-#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		w = (gint) _tmp5_;
-#line 12809 "ui.c"
-	} else {
-		gint _tmp6_ = 0;
-		gdouble _tmp7_ = 0.0;
-#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = w;
-#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = round (_tmp6_ * G_SQRT2);
-#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		h = (gint) _tmp7_;
-#line 12819 "ui.c"
-	}
-#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = c;
-#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = w;
-#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = h;
-#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
-#line 2326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = c;
-#line 2326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = w;
-#line 2326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = h;
-#line 2326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_rectangle (_tmp13_, 0.5, 0.5, (gdouble) (_tmp14_ - 1), (gdouble) (_tmp15_ - 1));
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = c;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = self->priv->r;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = self->priv->g;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = self->priv->b;
-#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_set_source_rgb (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
-#line 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = c;
-#line 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_fill_preserve (_tmp20_);
-#line 2331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = c;
-#line 2331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_set_line_width (_tmp21_, 1.0);
-#line 2332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = c;
-#line 2332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_set_source_rgb (_tmp22_, 0.0, 0.0, 0.0);
-#line 2333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = c;
-#line 2333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_stroke (_tmp23_);
-#line 2336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = c;
-#line 2336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = self->priv->text;
-#line 2336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_text_extents (_tmp24_, _tmp25_, &_tmp26_);
-#line 2336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	extents = _tmp26_;
-#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = c;
-#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = w;
-#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = extents;
-#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = _tmp29_.width;
-#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = h;
-#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = extents;
-#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = _tmp32_.height;
-#line 2337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_translate (_tmp27_, ((_tmp28_ - _tmp30_) * 0.5) - 0.5, ((_tmp31_ + _tmp33_) * 0.5) - 0.5);
-#line 2338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = c;
-#line 2338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = self->priv->text;
-#line 2338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_show_text (_tmp34_, _tmp35_);
-#line 2340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = TRUE;
-#line 2340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 12901 "ui.c"
-}
-
-
-static void page_icon_class_init (PageIconClass * klass) {
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page_icon_parent_class = g_type_class_peek_parent (klass);
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_type_class_add_private (klass, sizeof (PageIconPrivate));
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	((GtkWidgetClass *) klass)->get_preferred_width = (void (*)(GtkWidget*, gint*, gint*)) page_icon_real_get_preferred_width;
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	((GtkWidgetClass *) klass)->get_preferred_height = (void (*)(GtkWidget*, gint*, gint*)) page_icon_real_get_preferred_height;
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	((GtkWidgetClass *) klass)->get_preferred_height_for_width = (void (*)(GtkWidget*, gint, gint*, gint*)) page_icon_real_get_preferred_height_for_width;
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	((GtkWidgetClass *) klass)->get_preferred_width_for_height = (void (*)(GtkWidget*, gint, gint*, gint*)) page_icon_real_get_preferred_width_for_height;
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	((GtkWidgetClass *) klass)->draw = (gboolean (*)(GtkWidget*, cairo_t*)) page_icon_real_draw;
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (klass)->finalize = page_icon_finalize;
-#line 12922 "ui.c"
-}
-
-
-static void page_icon_instance_init (PageIcon * self) {
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv = PAGE_ICON_GET_PRIVATE (self);
-#line 12929 "ui.c"
-}
-
-
-static void page_icon_finalize (GObject* obj) {
-	PageIcon * self;
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
-#line 2281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->text);
-#line 2279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
-#line 12941 "ui.c"
-}
-
-
-GType page_icon_get_type (void) {
-	static volatile gsize page_icon_type_id__volatile = 0;
-	if (g_once_init_enter (&page_icon_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PageIconClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) page_icon_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PageIcon), 0, (GInstanceInitFunc) page_icon_instance_init, NULL };
-		GType page_icon_type_id;
-		page_icon_type_id = g_type_register_static (gtk_drawing_area_get_type (), "PageIcon", &g_define_type_info, 0);
-		g_once_init_leave (&page_icon_type_id__volatile, page_icon_type_id);
-	}
-	return page_icon_type_id__volatile;
-}
-
-
-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);
-}
-
-
-static gint _vala_array_length (gpointer array) {
-	int length;
-	length = 0;
-	if (array) {
-		while (((gpointer*) array)[length]) {
-			length++;
-		}
-	}
-	return length;
-}
-
-
-